Changeset 805

Timestamp:

Aug 26, 2007, 5:30:13 AM (18 years ago)

Author:

Steven Levine

Message:

IconProc: do not use freed memory - random bad things happen

File:

• trunk/dll/info.c (modified) (8 diffs)

trunk/dll/info.c

@@ -20 +20 @@
   19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  25 Aug 07 SHL Drop list from FILESTUF - data not static
+  25 Aug 07 SHL IconProc: do not use freed memory - random bad things happen
 
 ***********************************************************************/
@@ -332 +334 @@
   USHORT size;
   CHAR szFileName[CCHMAXPATH];
-  CHAR **list;
   BOOL madechanges;
 } FILESTUF;
@@ -456 +457 @@
       return WinDefWindowProc(hwnd, msg, mp1, mp2);
     else {
+      PFNWP oldproc = pis->oldproc;
       if (pis->lasthwndMenu)
-        WinDestroyWindow(pis->lasthwndMenu);
+        WinDestroyWindow(pis->lasthwndMenu);
       free(pis);
+      return oldproc(hwnd, msg, mp1, mp2);
     }
     break;
@@ -470 +473 @@
   FILESTUF *pfs;
   ICONSTUF *pis;
+  CHAR **ppsz;
 
   switch (msg) {
@@ -482 +486 @@
       break;
     }
-    pfs->list = (CHAR **) mp2;
     pfs->size = sizeof(FILESTUF);
     WinSetWindowPtr(hwnd, QWL_USER, pfs);
@@ -492 +495 @@
       CHAR s[CCHMAXPATH];
 
-      for (x = 0; pfs->list[x]; x++) {
-        if (DosQueryPathInfo(pfs->list[x], FIL_QUERYFULLNAME, s, sizeof(s)))
-          strcpy(s, pfs->list[x]);
+      ppsz = (CHAR **)mp2;
+      for (x = 0; ppsz[x]; x++) {
+        if (DosQueryPathInfo(ppsz[x], FIL_QUERYFULLNAME, s, sizeof(s)))
+          strcpy(s, ppsz[x]);
         WinSendDlgItemMsg(hwnd,
                           FLE_NAME,
@@ -551 +555 @@
         }
         break;
-      }
+      } // switch
       break;
     case FLE_NAME:
@@ -774 +778 @@
           WinEnableWindow(WinWindowFromID(hwnd, FLE_ISARCHIVE), TRUE);
           WinEnableWindow(WinWindowFromID(hwnd, FLE_BINARY), TRUE);
-          fp = _fsopen(pfs->szFileName, "rb", SH_DENYNO);
+          fp = _fsopen(pfs->szFileName, "rb", SH_DENYNO);
           if (fp) {
             char buff[512];