Changeset 1029 for trunk/dll/collect.c

Timestamp:

Jun 23, 2008, 3:30:16 AM (17 years ago)

Author:

Gregg Young

Message:

Fixed early memory free; Added free_... functions to make fortify checking easier; Added fortify scopes; Delete now moves to trash can on systems with the xworkplace trash can installed.

File:

• trunk/dll/collect.c (modified) (5 diffs)

trunk/dll/collect.c

@@ -785 +785 @@
     }
     xfree(mp1, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
     return 0;
 
@@ -1464 +1467 @@
     if (mp1) {
       if (!dcd) {
-        xfree(mp1, pszSrcFile, __LINE__);
+        xfree(mp1, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
         Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       }
@@ -1471 +1477 @@
           Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
           xfree(mp1, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
         }
       }
@@ -1596 +1605 @@
             if (p) {
               if (!PostMsg(hwnd, UM_COLLECTFROMFILE, MPFROMP(p), MPVOID))
-                xfree(p, pszSrcFile, __LINE__);
+                xfree(p, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
             }
           }
@@ -2675 +2687 @@
                            (INT) mp1, (CHAR *)mp2, dcd->hwndFrame);
       xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
       return MRFROMLONG(ret);
     }