Skip to content

W
wine-cw
Commit d315f6b1 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

Check for NULL pointers returned by HeapAlloc.

parent 6be39b60
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 15 deletions
dlls/gdi/freetype.c
View file @ d315f6b1
...@@ -974,21 +974,22 @@ BOOL WineEngInit(void) ...@@ -974,21 +974,22 @@ BOOL WineEngInit(void)
valuelen++; /* returned value doesn't include room for '\0' */ valuelen++; /* returned value doesn't include room for '\0' */
valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR));
data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR));
if (valueW && data)
dlen = datalen * sizeof(WCHAR); {
vlen = valuelen; dlen = datalen * sizeof(WCHAR);
while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, data, vlen = valuelen;
&dlen) == ERROR_SUCCESS) { while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, data,
if(((LPWSTR)data)[0] && ((LPWSTR)data)[1] == ':') &dlen) == ERROR_SUCCESS) {
if(wine_get_unix_file_name((LPWSTR)data, unixname, sizeof(unixname))) if(((LPWSTR)data)[0] && ((LPWSTR)data)[1] == ':')
AddFontFileToList(unixname, NULL, FALSE); if(wine_get_unix_file_name((LPWSTR)data, unixname, sizeof(unixname)))
AddFontFileToList(unixname, NULL, FALSE);
/* reset dlen and vlen */ /* reset dlen and vlen */
dlen = datalen; dlen = datalen;
vlen = valuelen; vlen = valuelen;
} }
HeapFree(GetProcessHeap(), 0, data); }
HeapFree(GetProcessHeap(), 0, valueW); if (data) HeapFree(GetProcessHeap(), 0, data);
if (valueW) HeapFree(GetProcessHeap(), 0, valueW);
RegCloseKey(hkey); RegCloseKey(hkey);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment