With some apps a fault was possible in ExtractAssociatedIcon.

4fb5ab47 · Dave Hawkes · Alexandre Julliard · dbb6ab22 · 4fb5ab47
Commit 4fb5ab47 authored Jul 09, 2000 by Dave Hawkes Committed by Alexandre Julliard Jul 09, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

shell.c dlls/shell32/shell.c +4 -0

No files found.
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -978,9 +978,13 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp
 */
 HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWORD lpiIcon)
 {	HICON16 hIcon;
+	DWORD dwDummyIcon = 0;

 	TRACE("\n");

+	if(lpiIcon == NULL)
+	    lpiIcon = &dwDummyIcon;
+
 	hIcon = ExtractIcon16(hInst, lpIconPath, *lpiIcon);

 	if( hIcon < 2 )