Changeset 1442 for trunk/dll

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.

Location:

trunk/dll

Files:

• collect.c (modified) (3 diffs)
• excputil.c (modified) (1 diff)
• fortify.c (modified) (1 diff)
• mainwnd.c (modified) (3 diffs)

trunk/dll/collect.c

@@ -68 +68 @@
   12 Jul 09 GKY Add szFSType to FillInRecordFromFSA use to bypass EA scan and size formatting
                 for tree container
+  13 Jul 09 GKY Fixed double free of memory buffer in UM_COLLECTFROMFILE
 
 ***********************************************************************/
@@ -870 +871 @@
         fclose(fp);
       }
-    }
-    xfree(mp1, pszSrcFile, __LINE__);
+      free(mp1);
+    }
 #   ifdef FORTIFY
     Fortify_LeaveScope();
@@ -1580 +1581 @@
       Fortify_BecomeOwner(mp1);
 #     endif
-      if (!dcd)
-        Runtime_Error(pszSrcFile, __LINE__, NULL);
+      if (!dcd) {
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
+        free(mp1);
+      }
       else {
         if (!PostMsg(dcd->hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
-          Runtime_Error(pszSrcFile, __LINE__, PCSZ_POSTMSG);
-        }
-      }
-      free(mp1);
+          Runtime_Error(pszSrcFile, __LINE__, PCSZ_POSTMSG);
+          free(mp1);
+        }
+      }
 #     ifdef FORTIFY
       DosSleep(1);                      // Let receiver take ownership

trunk/dll/excputil.c

@@ -30 +30 @@
 
 #include "excputil.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;

trunk/dll/fortify.c

@@ -1571 +1571 @@
                 }
 
-                sprintf(st_Buffer, "%02x%s", *ptr, ((column % 4) == 3) ? " " : NullStr);
+                sprintf(st_Buffer, "%02x%s", *ptr, ((column % 4) == 3) ? " " : "");
                 st_Output(st_Buffer);
 

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));