Changeset 959 for trunk/dll/assoc.c

Timestamp:

Feb 18, 2008, 1:47:31 AM (18 years ago)

Author:

Gregg Young

Message:

Use xfree where appropriate. Check that buffer exists following all xmallocs. Stopped at eas.c with xfree checking. One remaining xmalloc without test in dirsize.c

File:

• trunk/dll/assoc.c (modified) (7 diffs)

trunk/dll/assoc.c

@@ -117 +117 @@
   while (info) {
     next = info->next;
-    free(info->mask);
-    free(info->cl);
-    if (info->sig)
-      free(info->sig);
-    free(info);
+    xfree(info->mask);
+    xfree(info->cl);
+    xfree(info->sig);
+    xfree(info);
     info = next;
   }
@@ -177 +176 @@
         info->flags = atol(flags);
         if (!info->cl || !info->mask) {
-          if (info->cl)
-            free(info->cl);
-          if (info->mask)
-            free(info->mask);
-          free(info);
+          xfree(info->cl);
+          xfree(info->mask);
+          xfree(info);
           break;
         }
@@ -272 +269 @@
           info->flags = addme->flags;
         if (!info->cl || !info->mask) {
-          if (info->cl)
-            free(info->cl);
-          if (info->mask)
-            free(info->mask);
-          free(info);
+          xfree(info->cl);
+          xfree(info->mask);
+          xfree(info);
         }
         else {
@@ -320 +315 @@
             asstail = info->prev;
         }
-        free(info->cl);
-        free(info->mask);
-        if (info->sig)
-          free(info->sig);
-        free(info);
+        xfree(info->cl);
+        xfree(info->mask);
+        xfree(info->sig);
+        xfree(info);
         return TRUE;
       }
@@ -646 +640 @@
         }
         pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        if (!pszWorkBuf)
+          break; //already complained
         memset(&temp, 0, sizeof(ASSOC));
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
@@ -735 +731 @@
 
         pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        if (!pszWorkBuf)
+          break; //already complained
         memset(&temp, 0, sizeof(ASSOC));
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
@@ -850 +848 @@
                                       MPFROMSHORT(LIT_CURSOR), MPVOID);
         pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        if (!pszWorkBuf)
+          break; //already complained
         memset(&temp, 0, sizeof(ASSOC));
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);