From 126884f030d148ad12d59e9c7e4818fd594d63d4 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Mon, 12 Jul 2004 19:53:36 +0000
Subject: [PATCH] Stop PrivateExtractIcons from crashing given an invalid icon
 index.

---
 dlls/user/exticon.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c
index 7393f037212..aa4086b9db1 100644
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
@@ -543,6 +543,12 @@ static UINT ICO_ExtractIconExW(
 	  {
 	    const IMAGE_RESOURCE_DIRECTORY *xresdir;
 	    xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir);
+            if( !xresdir )
+            {
+              WARN("icon entry %d not found\n", LOWORD(pIconId[i]));
+	      RetPtr[i]=0;
+	      continue;
+            }
 	    xresdir = find_entry_default(xresdir, rootresdir);
 	    idataent = (PIMAGE_RESOURCE_DATA_ENTRY)xresdir;
 	    idata = NULL;