Stop PrivateExtractIcons from crashing given an invalid icon index.

126884f0 · Mike McCormack · Alexandre Julliard · f4c813f7 · 126884f0
Commit 126884f0 authored Jul 12, 2004 by Mike McCormack Committed by Alexandre Julliard Jul 12, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

exticon.c dlls/user/exticon.c +6 -0

No files found.
--- 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;