Changeset 1102 for trunk/dll/treecnr.c

Timestamp:

08/02/08 22:29:35 (4 months 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

Files:

• trunk/dll/treecnr.c (modified) (4 diffs)

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,