Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Giannis Adamopoulos (johnyadams@hotmail.com)

Browse source 
- 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
This commit is contained in:
Colin Finck 2008-09-09 17:49:23 +00:00
parent 0abf5b122d
commit bdf36ed7e5
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/gdi32/objects/font.c
View file

@ -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);
}