CreateFontIndirect() can get NULL pointers.

46384145 · Marcus Meissner · Alexandre Julliard · 1c80bc92 · 46384145
Commit 46384145 authored Dec 29, 2000 by Marcus Meissner Committed by Alexandre Julliard Dec 29, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

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

No files found.
--- a/objects/font.c
+++ b/objects/font.c
@@ -353,8 +353,12 @@ HFONT WINAPI CreateFontIndirectA( const LOGFONTA *font )
 {
    LOGFONT16 font16;

-    FONT_LogFont32ATo16( font, &font16 );
-    return CreateFontIndirect16( &font16 );
+    if (font) {
+	FONT_LogFont32ATo16( font, &font16 );
+	return CreateFontIndirect16( &font16 );
+     } else
+	return CreateFontIndirect16( NULL );
+
 }

 /***********************************************************************
@@ -364,8 +368,11 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *font )
 {
    LOGFONT16 font16;

-    FONT_LogFont32WTo16( font, &font16 );
-    return CreateFontIndirect16( &font16 );
+    if (font) {
+	FONT_LogFont32WTo16( font, &font16 );
+	return CreateFontIndirect16( &font16 );
+    } else
+	return CreateFontIndirect16( NULL );
 }

 /***********************************************************************