Changeset 1113 for trunk/dll/dirsize.c

Timestamp:

Aug 24, 2008, 5:24:19 AM (17 years ago)

Author:

Gregg Young

Message:

Use pszDisplayName for display in dirsize.c change free code to free it; fix memory leak in dirsize. (Ticket 269)

File:

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

trunk/dll/dirsize.c

@@ -59 +59 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "filldir.h"                    // EmptyCnr...
 #include "fm3dll.h"
 
@@ -363 +364 @@
     pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
     // use DisplayName for display hopefully fixes "strlen" trap 02 AUG 08 GKY
-    if (pci->pszDisplayName)
+    if (pci->pszDisplayName) {
+#     ifdef FORTIFY
+      Fortify_ChangeScope(pci->pszDisplayName, -1);
+      Fortify_ChangeScope(pci->pszFileName, -1);
+#     endif
       WinSendMsg(hwndCnr, CM_INVALIDATERECORD, MPFROMP(&pci), MPFROM2SHORT(1, 0));
+    }
     isroot = FALSE;
   }
@@ -1016 +1022 @@
   case WM_DESTROY:
     pState = INSTDATA(hwnd);
+    EmptyCnr(hwnd);
     if (pState) {
       pState->chStopFlag = (BYTE)0xff;