shell32: handle corrupt entry in iconcache registry entry (Coverity).

265c959e · Marcus Meissner · Alexandre Julliard · 478592cd · 265c959e
Commit 265c959e authored Dec 03, 2009 by Marcus Meissner Committed by Alexandre Julliard Dec 04, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

iconcache.c dlls/shell32/iconcache.c +7 -3

No files found.
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -495,9 +495,13 @@ static int SIC_LoadOverlayIcon(int icon_idx)
 	    {
 		LPWSTR p = strchrW(buffer, ',');

-		if (p)
-		    *p++ = 0;
-
+		if (!p)
+		{
+		    ERR("Icon index in %s/%s corrupted, no comma.\n", debugstr_w(wszShellIcons),debugstr_w(wszIdx));
+		    RegCloseKey(hKeyShellIcons);
+		    return -1;
+		}
+		*p++ = 0;
 		iconPath = buffer;
 		iconIdx = atoiW(p);
 	    }