Giannis Adamopoulos (johnyadams@hotmail.com)

- Check if lpLogFont is NULL, so we don't crash if it is.
  Verified by the GDI32 Wine test, which explicitly checks for this behaviour and doesn't crash under WinXP SP2.

See issue #3725 for more details.

svn path=/trunk/; revision=36092

diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c
index becc851..faf7489 100644 (file)
--- a/reactos/dll/win32/gdi32/objects/font.c
+++ b/reactos/dll/win32/gdi32/objects/font.c
@@ -391,12 +391,17 @@ int STDCALL
 EnumFontFamiliesExA (HDC hdc, LPLOGFONTA lpLogfont, FONTENUMPROCA lpEnumFontFamExProc,
                      LPARAM lParam, DWORD dwFlags)
 {
-  LOGFONTW LogFontW;
+  LOGFONTW LogFontW, *pLogFontW;
 
-  LogFontA2W(&LogFontW, lpLogfont);
+  if (lpLogfont)
+  {
+    LogFontA2W(&LogFontW,lpLogfont);
+    pLogFontW = &LogFontW;
+  }
+  else pLogFontW = NULL;
 
   /* no need to convert LogFontW back to lpLogFont b/c it's an [in] parameter only */
-  return IntEnumFontFamilies(hdc, &LogFontW, lpEnumFontFamExProc, lParam, FALSE);
+  return IntEnumFontFamilies(hdc, pLogFontW, lpEnumFontFamExProc, lParam, FALSE);
 }