Changeset 1032 for trunk/dll/grep.c

Timestamp:

Jun 30, 2008, 4:55:36 AM (17 years ago)

Author:

Gregg Young

Message:

Fortify updates including a leave scope wrapper which frees and in some cases reloads commands, archivers, association, etc.

File:

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

trunk/dll/grep.c

@@ -411 +411 @@
   if (grep.dupehead)
     FreeDupes(&grep);
-  if (grep.numlines && grep.matched)
+  if (grep.numlines && grep.matched) {
+# ifdef FORTIFY
+    xfree(grep.matched, pszSrcFile, __LINE__);
+# else
     free(grep.matched);
+# endif
+  }
   // 07 Feb 08 SHL fixme to free grep here when not static
 # ifdef FORTIFY
@@ -657 +662 @@
   if (grep) {
     if (grep->insertffb) {
-      for (x = 0; grep->insertffb[x]; x++)
-        free(grep->insertffb[x]);
-      free(grep->insertffb);
+      for (x = 0; grep->insertffb[x]; x++) {
+# ifdef FORTIFY
+        xfree(grep->insertffb[x], pszSrcFile, __LINE__);
+# else
+        free(grep->insertffb[x]);
+#endif
+      }
+      xfree(grep->insertffb, pszSrcFile, __LINE__);
     }
     if (grep->dir) {
-      for (x = 0; grep->dir[x]; x++)
-        free(grep->dir[x]);
-      free(grep->dir);
+      for (x = 0; grep->dir[x]; x++) {
+# ifdef FORTIFY
+        xfree(grep->dir[x], pszSrcFile, __LINE__);
+# else
+        free(grep->dir[x]);
+# endif
+      }
+      xfree(grep->dir, pszSrcFile, __LINE__);
     }
     grep->dir = NULL;
@@ -1147 +1162 @@
   while (i) {
     next = i->next;
-    if (i->name)
+    if (i->name) {
+# ifdef FORTIFY
+      xfree(i->name, pszSrcFile, __LINE__);
+# else
       free(i->name);
+# endif
+    }
+# ifdef FORTIFY
+    xfree(i, pszSrcFile, __LINE__);
+# else
     free(i);
+# endif
     i = next;
   }