Changeset 1097 for trunk/dll/notebook.c

Timestamp:

Jul 31, 2008, 8:35:00 PM (17 years ago)

Author:

John Small

Message:

Ticket 114: Improved code to avoid traps possibly caused by strings being freed
prematurely.

File:

• trunk/dll/notebook.c (modified) (2 diffs)

trunk/dll/notebook.c

@@ -38 +38 @@
   19 Jul 08 JBS Ticket 197: Support accelerator keys in setting dialogs.
   20 Jul 08 JBS Ticket 114: Support user-selectable env. strings in Tree container.
+  31 Jul 08 JBS Ticket 114: Improved code to avoid traps.
 
 ***********************************************************************/
@@ -1290 +1291 @@
                 (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
                 MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        PostMsg(hwndTree, UM_SHOWME, MPFROMP(pci->pszFileName), MPVOID);
-
+        pszTemp = xmalloc(strlen(pci->pszFileName) + 1, pszSrcFile, __LINE__);
+        if (pszTemp) {
+          strcpy(pszTemp, pci->pszFileName);
+          PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID);
+          /* pszTemp is freed in the UM_SHOWME code */
+        }
       }
     }