diff --git a/mozilla/xpinstall/wizard/windows/setup/dialogs.c b/mozilla/xpinstall/wizard/windows/setup/dialogs.c
index aac7151bae1..0be962bc55b 100644
--- a/mozilla/xpinstall/wizard/windows/setup/dialogs.c
+++ b/mozilla/xpinstall/wizard/windows/setup/dialogs.c
@@ -214,13 +214,13 @@ LRESULT CALLBACK DlgProcLicense(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
 
       if((hFLicense = FindFirstFile(szBuf, &wfdFindFileData)) != INVALID_HANDLE_VALUE)
       {
-        dwFileSize = (wfdFindFileData.nFileSizeHigh * MAXDWORD) + wfdFindFileData.nFileSizeLow;
+        dwFileSize = (wfdFindFileData.nFileSizeHigh * MAXDWORD) + wfdFindFileData.nFileSizeLow + 1;
         FindClose(hFLicense);
         if((szLicenseFilenameBuf = NS_GlobalAlloc(dwFileSize)) != NULL)
         {
           if((fLicense = fopen(szBuf, "r+b")) != NULL)
           {
-            dwBytesRead = fread(szLicenseFilenameBuf, 1, dwFileSize, fLicense);
+            dwBytesRead = fread(szLicenseFilenameBuf, sizeof(char), dwFileSize, fLicense);
             fclose(fLicense);
             SetDlgItemText(hDlg, IDC_EDIT_LICENSE, szLicenseFilenameBuf);
           }
diff --git a/mozilla/xpinstall/wizard/windows/setup/xpi.c b/mozilla/xpinstall/wizard/windows/setup/xpi.c
index 9a8fc03ffef..fd2f3f3927c 100644
--- a/mozilla/xpinstall/wizard/windows/setup/xpi.c
+++ b/mozilla/xpinstall/wizard/windows/setup/xpi.c
@@ -568,8 +568,8 @@ DrawBarberBar(HWND hWnd, int nBars)
 	PAINTSTRUCT	ps;
 	HDC         hDC;
 	RECT        rect;
-	HBRUSH      hBrush;
-	HBRUSH      hBrushClear;
+	HBRUSH      hBrush      = NULL;
+	HBRUSH      hBrushClear = NULL;
 
   hDC = BeginPaint(hWnd, &ps);
 	GetClientRect(hWnd, &rect);
@@ -604,8 +604,12 @@ DrawBarberBar(HWND hWnd, int nBars)
 	  }
   }
 
-	DeleteObject(hBrushClear);
-	DeleteObject(hBrush);
+  if(hBrushClear)
+    DeleteObject(hBrushClear);
+
+  if(hBrush)
+    DeleteObject(hBrush);
+
 	EndPaint(hWnd, &ps);
 }