Handle NULL buffer in GetObject.

e9280a1e · Mike McCormack · Alexandre Julliard · 7018230a · e9280a1e
Commit e9280a1e authored Aug 20, 2002 by Mike McCormack Committed by Alexandre Julliard Aug 20, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

font.c objects/font.c +4 -2

No files found.
--- a/objects/font.c
+++ b/objects/font.c
@@ -672,7 +672,8 @@ static INT FONT_GetObjectA( HGDIOBJ handle, void *obj, INT count, LPVOID buffer 
    FONT_LogFontWToA( &font->logfont, &lfA );

    if (count > sizeof(lfA)) count = sizeof(lfA);
-    memcpy( buffer, &lfA, count );
+    if(buffer)
+        memcpy( buffer, &lfA, count );
    return count;
 }

@@ -683,7 +684,8 @@ static INT FONT_GetObjectW( HGDIOBJ handle, void *obj, INT count, LPVOID buffer 
 {
    FONTOBJ *font = obj;
    if (count > sizeof(LOGFONTW)) count = sizeof(LOGFONTW);
-    memcpy( buffer, &font->logfont, count );
+    if(buffer)
+        memcpy( buffer, &font->logfont, count );
    return count;
 }