Changeset 1102

Timestamp:

08/02/08 22:29:35 (5 weeks ago)

Author:

gyoung

Message:

Make the variable passed to treecnr UM_RESCAN a pointer to a temp variable every where to avoid freeing pci->pszFileName or dcd->directory early

Location:

trunk/dll

Files:

• dircnrs.c (modified) (4 diffs)
• treecnr.c (modified) (4 diffs)

trunk/dll/dircnrs.c

@@ -46 +46 @@
   20 Jul 08 GKY Add save/append filename to clipboard.
                 Change menu wording to make these easier to find
+  02 Aug 08 GKY Always pass temp variable point to treecnr UM_SHOWME to avoid
+                freeing dcd->directory early
 
 ***********************************************************************/
@@ -781 +783 @@
       }
       if (fSwitchTree && hwndTree) {
+        PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+
         if (hwndMain) {
-          if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame)
-            WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory), MPVOID);
-        }
-        else
-          WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory), MPVOID);
+          if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame && pszTempDir)
+            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+              free(pszTempDir);
+        }
+        else {
+          if (pszTempDir)
+            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+              free(pszTempDir);
+        }
       }
       dcd->firsttree = FALSE;
@@ -1334 +1342 @@
       LastDir = hwnd;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-      if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory)
-        WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory), MPVOID);
+      if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
+        PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+
+        if (pszTempDir) {
+          if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+            free(pszTempDir);
+        }
+      }
     }
     break;
@@ -1843 +1857 @@
 
       case IDM_FINDINTREE:
-        if (hwndTree)
-          WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory),
-                     MPFROMLONG(1L));
+        if (hwndTree) {
+          PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+
+          if (pszTempDir) {
+            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir),
+                            MPFROMLONG(1L)))
+              free(pszTempDir);
+          }
+        }
         break;
 

trunk/dll/treecnr.c

@@ -46 +46 @@
   15 Feb 08 SHL Sync with settings menu rework
   15 Feb 08 SHL Avoid death if tree container 0 width
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
+  02 Aug 08 GKY Always pass temp variable point to UM_SHOWME to avoid freeing pci->pszFileName early
 
 ***********************************************************************/
@@ -674 +676 @@
       if (cnri.cRecords) {
         sprintf(s, GetPString(IDS_NUMDRIVESTEXT), cnri.cRecords);
-        if (pci) {
+        if (pci && pci->pszFileName) {
           if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
                 DRIVE_REMOVABLE) ||
@@ -2354 +2356 @@
       case IDM_FINDINTREE:
         {
-          CHAR dir[CCHMAXPATH];
+          PSZ pszTempDir;
           PCNRITEM pci;
 
           pci = (PCNRITEM) CurrentRecord(hwnd);
           if (pci && (INT) pci != -1) {
-            strcpy(dir, pci->pszFileName);
-            MakeValidDir(dir);
+            pszTempDir = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+            if (pszTempDir)
+              MakeValidDir(pszTempDir);
           }
           else
-            save_dir2(dir);
-          if (WinDlgBox(HWND_DESKTOP, dcd->hwndParent,
-                        WalkAllDlgProc,
-                        FM3ModHandle, WALK_FRAME, MPFROMP(dir)) && *dir)
-            WinSendMsg(hwnd, UM_SHOWME, MPFROMP(dir), MPFROMLONG(1));
+            pszTempDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
+          if (pszTempDir) {
+            if (WinDlgBox(HWND_DESKTOP, dcd->hwndParent,
+                          WalkAllDlgProc,
+                          FM3ModHandle, WALK_FRAME, MPFROMP(pszTempDir))) {
+              if (!WinSendMsg(hwnd, UM_SHOWME, MPFROMP(pszTempDir), MPFROMLONG(1)))
+                free(pszTempDir);
+            }
+            else
+              free(pszTempDir);
+          }
         }
         break;
@@ -2440 +2449 @@
           }
           else
-            save_dir2(newpath);
+            strcpy(newpath, pFM2SaveDirectory);
           if (!WinDlgBox(HWND_DESKTOP, dcd->hwndParent, WalkAllDlgProc,
                          FM3ModHandle, WALK_FRAME,