Changeset 1100

Timestamp:

Aug 2, 2008, 8:13:19 PM (17 years ago)

Author:

John Small

Message:

Ticket 114: Improved code to avoid traps (part 2)

File:

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

trunk/dll/notebook.c ¶

@@ -39 +39 @@
   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.
+  02 Aug 08 JBS Ticket 114: Improved code to avoid traps.
 
 ***********************************************************************/
@@ -1279 +1280 @@
         }
         free(pszTemp);
-      } else {
-        Runtime_Error(pszSrcFile, __LINE__, "Unable to allocate memory");
       }
       if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
@@ -1291 +1290 @@
                 (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
                 MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        pszTemp = xmalloc(strlen(pci->pszFileName) + 1, pszSrcFile, __LINE__);
+        pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
         if (pszTemp) {
-          strcpy(pszTemp, pci->pszFileName);
           PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID);
           /* pszTemp is freed in the UM_SHOWME code */