Changeset 1829 for trunk/dll/common.c

Timestamp:

Jul 13, 2015, 12:01:22 AM (10 years ago)

Author:

Gregg Young

Message:

Fix CN_REALLOCPSZ file name editing code to: 1) Actually reallocate the buffer. 2) Point pci->pszDisplayName into the new buffer 3) Eliminate the possibility of updating the container before CN_ENDEDIT is called. 4) Only call RemoveCnrItems for tree container and collector. Ticket [557]

File:

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

trunk/dll/common.c

@@ -33 +33 @@
   14 Sep 09 SHL Blink thread LEDs while threads working
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  12 Jul 15 GKY Fix CN_REALLOCPSZ file name editing code to: 1) Actually reallocate the buffer.
+                2) Point pci->pszDisplayName into the new buffer 3) Eliminate the possibility
+                of updating the container before CN_ENDEDIT is called. 4) Only call RemoveCnrItems
+                for tree container and collector.
 
 ***********************************************************************/
@@ -871 +875 @@
       }
       else if (mp2) {
-        if ((INT) mp1 == -1) {
-          PCNRITEM pci = (PCNRITEM) mp2;
-          RemoveCnrItems(hwnd, pci, 1, CMA_FREE | CMA_INVALIDATE);
-        }
-        else {
+        if ((INT) mp1 == -1) {
+          PCNRITEM pci = (PCNRITEM) mp2;
+          RemoveCnrItems(hwnd, pci, 1, CMA_FREE | CMA_INVALIDATE);
+        }
+        else {
           Broadcast(WinQueryAnchorBlock(hwnd),
-                    dcd->hwndParent, UM_UPDATERECORD, mp2, MPVOID);
-          free(mp2);
-        }
+                    dcd->hwndParent, UM_UPDATERECORD, mp2, MPVOID);
+          xfree(mp2, pszSrcFile, __LINE__);
+        }
       }
     }