Changeset 1051

Timestamp:

07/08/08 05:15:11 (2 months ago)

Author:

gyoung

Message:

Fixed 2 traps in dirsize; tcket 243

Location:

trunk/dll

Files:

• dirsize.c (modified) (14 diffs)
• filldir.c (modified) (1 diff)

trunk/dll/dirsize.c

@@ -33 +33 @@
   29 Feb 08 GKY Use xfree where appropriate
   29 Feb 08 GKY Add presparams & update appearence of "Sizes" dialog
+  07 Jul 08 GKY Fixed trap in PMCTLS (strlen) inadequate memory allocation
+  07 Jul o8 GKY Fixed trap by no longer allocating pci->pszLongName as flag but pointing isroot
+                version to NullStr and all others to NULL.
 
 ***********************************************************************/
@@ -204 +207 @@
   // fixme to understand this - appears to be indirectly saving length, but why?
   pci->pszDisplayName = pci->pszFileName + strlen(pci->pszFileName);
-  pci->pszLongName = pci->pszFileName;  // fixme to be sure?
   pci->rc.pszIcon = pci->pszFileName;
   pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
@@ -211 +213 @@
   else if (fForceLower)
     strlwr(pci->pszFileName);
-  pci->pszDisplayName = pci->pszFileName + strlen(pci->pszFileName);
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);
@@ -308 +309 @@
     CHAR szAllDir[80];
     CHAR szBar[80];
+    CHAR szBuf[CCHMAXPATH * 2];
+
+# ifdef FORTIFY
+  Fortify_EnterScope();
+# endif
 
     // cbFile = currect directory usage in bytes
@@ -313 +319 @@
     CommaFmtULL(szCurDir, sizeof(szCurDir), pci->cbFile, 'K');
     *szBar = 0;
-
+    pci->pszLongName = NULL;
     if (ullTotalBytes) {
       register UINT cBar;
@@ -319 +325 @@
       if (isroot) {
         FSALLOCATE fsa;
-        APIRET rc;
-
-        memset(&fsa, 0, sizeof(fsa));
+        APIRET rc;
+
+
+        memset(&fsa, 0, sizeof(fsa));
         rc = DosQueryFSInfo(toupper(*pci->pszFileName) - '@', FSIL_ALLOC, &fsa,
                             sizeof(FSALLOCATE));
@@ -328 +335 @@
             ((float)fsa.cUnit * (fsa.cSectorUnit * fsa.cbSector));
         }
-        // Need unique buffer 23 Jul 07 SHL
-        pci->pszLongName = xmalloc(3, pszSrcFile, __LINE__);
-        if (pci->pszLongName) {
-          pci->pszLongName[0] = 0;      // Make null string
-          pci->pszLongName[1] = 1;      // Flag root - hack cough
-          pci->pszLongName[2] = 0;        // terminate anyway
-        }
+        // Need unique buffer 23 Jul 07 SHL
+        pci->pszLongName = NullStr;
       }
       else
@@ -355 +357 @@
     CommaFmtULL(szAllDir, sizeof(szAllDir), pci->cbFile + pci->easize, 'K');
     c = pci->pszDisplayName - pci->pszFileName;
-    pci->pszFileName = xrealloc(pci->pszFileName,
-                                CCHMAXPATH,
-                                pszSrcFile,
-                                __LINE__);      // 23 Jul 07 SHL
-    sprintf(pci->pszFileName + c,
-            "  %s + %s = %s (%.02lf%%%s)\r%s",
+    sprintf(szBuf,
+            "%s  %s + %s = %s (%.02lf%%%s)\r%s",
+            pci->pszFileName,
             szCurDir,
             szSubDir,
@@ -366 +365 @@
             fltPct,
             isroot ? GetPString(IDS_OFDRIVETEXT) : NullStr,
-            szBar);
-    pci->pszFileName = xrealloc(pci->pszFileName,
-                                strlen(pci->pszFileName) + 1,
-                                pszSrcFile,
-                                __LINE__);      // 23 Jul 07 SHL
+            szBar);
+    free(pci->pszFileName);
+    pci->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);
     pci->pszDisplayName = pci->pszFileName + c;
     WinSendMsg(hwndCnr,
@@ -673 +670 @@
             if (p) {
               // draw text
-              if (*(pci->pszLongName + 1) == 1)  // is root record
+              if (pci->pszLongName == NullStr)  // is root record
                 GpiSetColor(oi->hps, CLR_DARKRED);
               else if (!pci->cbFile)            // no size
@@ -759 +756 @@
               // fill box with graph bar, flags is integer %
               if (pci->flags) {
-                if (*(pci->pszLongName + 1) == 1)       // is root record
+                if (pci->pszLongName == NullStr)        // is root record
                   GpiSetColor(oi->hps, CLR_DARKGREEN);
                 else
@@ -771 +768 @@
 
                 // draw highlights and shadows on graph
-                if (*(pci->pszLongName + 1) == 1)
+                if (pci->pszLongName == NullStr)
                   GpiSetColor(oi->hps, CLR_GREEN);
                 else
@@ -788 +785 @@
                 ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                 GpiLine(oi->hps, &ptl);
-                if (*(pci->pszLongName + 1) != 1) {
+                if (pci->pszLongName == NULL) {
                   GpiSetColor(oi->hps, CLR_DARKRED);
                   ptl.x = oi->rclItem.xLeft + 2;
@@ -839 +836 @@
               } // for x
               return MRFROMLONG(TRUE);
-            }
+            }
           }
         }

trunk/dll/filldir.c

@@ -1610 +1610 @@
     free(psz);
   }
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+# endif
 }