Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32] Add ICO_ExtractIconExW RetPtr NULL check (#2149)

Browse source 
CORE-16557
This commit is contained in:
Katayama Hirofumi MZ 2019-12-16 20:37:23 +09:00 committed by GitHub
parent 23147330dd
commit 2af9e7dfac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
win32ss/user/user32/misc/exticon.c
View file

@ -469,17 +469,20 @@ static UINT ICO_ExtractIconExW(
icon = CreateIconFromResourceEx(imageData, entry->icHeader.biSizeImage, sig == 1, 0x00030000, cx[index], cy[index], flags); icon = CreateIconFromResourceEx(imageData, entry->icHeader.biSizeImage, sig == 1, 0x00030000, cx[index], cy[index], flags);
HeapFree(GetProcessHeap(), 0, cursorData);
if (icon) if (icon)
{ {
RetPtr[index] = icon; if (RetPtr)
iconCount = 1; RetPtr[index] = icon;
} else
DestroyIcon(icon);
if(cursorData != NULL) iconCount = 1;
HeapFree(GetProcessHeap(), 0, cursorData); break;
}
} }
} }
} }
ret = iconCount; /* return number of retrieved icons */ ret = iconCount; /* return number of retrieved icons */
} }