Changeset 959 for trunk/dll/notebook.c

Timestamp:

Feb 18, 2008, 1:47:31 AM (17 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/notebook.c (modified) (4 diffs)

trunk/dll/notebook.c

@@ -203 +203 @@
 
       pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      if (!pszWorkBuf)
+        return 0; //already complained
       WinQueryDlgItemText(hwnd, CFGA_VIRUS, MAXCOMLINESTRG, szCLBuf);
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
@@ -468 +470 @@
 
       pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      if (!pszWorkBuf)
+        return 0; //already complained
       WinQueryDlgItemText(hwnd, CFGV_VIEWER, MAXCOMLINESTRG, szCLBuf);
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
@@ -657 +661 @@
 
   case WM_CLOSE:
-    { // fixme these strings can be longer than CCHMAXPATH since
-      // they contain args.
+    {
       CHAR szCLBuf[MAXCOMLINESTRG], szPathBuf[CCHMAXPATH];
       PSZ pszWorkBuf;
 
       pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      if (!pszWorkBuf)
+        return 0; //already complained
       WinQueryDlgItemText(hwnd, CFGH_RUNHTTPWORKDIR, CCHMAXPATH, szPathBuf);
       szPathBuf[CCHMAXPATH - 1] = 0;
@@ -1275 +1280 @@
 
       pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      if (!pszWorkBuf)
+        return 0; //already complained
       WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, MAXCOMLINESTRG, szCLBuf);
         szCLBuf[MAXCOMLINESTRG - 1] = 0;