#241757

r=pedemont, sr=blizzard (platform specific)
OS/2 only - don't close a file that didn't get created

modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp

@@ -281,7 +281,7 @@ void ConvertColorBitMap(PBYTE buffer, PBITMAPINFO2 pBitMapInfo, nsCString& iconB
     {
       iIter = pBitMapInfo->cx;  // Bytes = Pels
     }
-    for (INT j = 0; j < pBitMapInfo->cy; j++)  //Number of rows
+    for (ULONG j = 0; j < pBitMapInfo->cy; j++)  //Number of rows
     {
       pPelPair = buffer;
       pPel     = (PBYTE)buffer;
@@ -302,7 +302,7 @@ void ConvertColorBitMap(PBYTE buffer, PBITMAPINFO2 pBitMapInfo, nsCString& iconB
       }
       if (numBytesPaddingPerRowRGB)
       {
-        for (INT k = 0; k < numBytesPaddingPerRowRGB; k++)
+        for (PRUint32 k = 0; k < numBytesPaddingPerRowRGB; k++)
         {
           iconBuffer.Append((char) 0);
         }
@@ -483,11 +483,13 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
       strcpy(tmpfile, tmpdir);
       strcat(tmpfile, pszFileName);
       FILE* fp = fopen(tmpfile, "wb+");
+      if (fp) {
         fclose(fp);
         hIcon = WinLoadFileIcon(tmpfile, FALSE);
         remove(tmpfile);
       }
     }
+  }
   if (hIcon == NULLHANDLE)
     return NS_ERROR_FAILURE;
   // we got a handle to an icon. Now we want to get a bitmap for the icon using GetIconInfo....