Changeset 1442 for trunk/dll/mainwnd.c

Timestamp:

Jul 14, 2009, 2:16:38 AM (16 years ago)

Author:

Gregg Young

Message:

Fixed 2 memory management problems; changes to get FORTIFY build to work again.

File:

• trunk/dll/mainwnd.c (modified) (3 diffs)

trunk/dll/mainwnd.c

@@ -91 +91 @@
   12 Jul 09 GKY Removed duplicate UM_SETUP2 message from RestoreDirCnrState caused dbl dir
                 listings in tree
+  13 Jul 09 GKY Fixed under allocation of memory in the paint code for the drivebar bitmap buttons
 
 ***********************************************************************/
@@ -1929 +1930 @@
         hbm = GpiLoadBitmap(hps, 0, iconid, 0, 0);
         if (hbm) {
-          pbmpData = xmallocz(sizeof(PBITMAPINFOHEADER), pszSrcFile, __LINE__);
+          pbmpData = xmallocz(sizeof(PBITMAPINFOHEADER) * 3, pszSrcFile, __LINE__);
           if (pbmpData) {
             GpiQueryBitmapParameters(hbm, pbmpData);
@@ -1936 +1937 @@
             aptl[3].x = pbmpData->cx;
             aptl[3].y = pbmpData->cy;
+            GpiWCBitBlt(hps, hbm, 4L, aptl, ROP_SRCCOPY, BBO_PAL_COLORS);
             free(pbmpData);
           }
-          GpiWCBitBlt(hps, hbm, 4L, aptl, ROP_SRCCOPY, BBO_PAL_COLORS);
         }
         memset(&fat, 0, sizeof(fat));