From 4fb5ab4765c8b68d0cbc4becc97473d266a03954 Mon Sep 17 00:00:00 2001
From: Dave Hawkes <daveh-wine@cadlink.com>
Date: Sun, 9 Jul 2000 12:17:23 +0000
Subject: [PATCH] With some apps a fault was possible in ExtractAssociatedIcon.

---
 dlls/shell32/shell.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 875d4a93cff..29d735d6ea6 100644
--- 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 )
-- 
2.11.4.GIT