Changeset 1175

Timestamp:

Sep 8, 2008, 9:18:14 PM (17 years ago)

Author:

Steven Levine

Message:

Avoid aliased pszLongName pointer in ActionCnrThread IDM_MOVE

File:

• trunk/dll/comp.c (modified) (22 diffs)

trunk/dll/comp.c

@@ -54 +54 @@
   16 Mar 08 GKY Prevent trap caused by files that exceed maxpath length
   11 Jul 08 JBS Ticket 230: Simplified code and eliminated some local variables by incorporating
-                all the details view settings (both the global variables and those in the
-                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+                all the details view settings (both the global variables and those in the
+                DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+  08 Sep 08 SHL Avoid aliased pszLongName pointer in ActionCnrThread IDM_MOVE
 
 ***********************************************************************/
@@ -80 +81 @@
 #include "tmrsvcs.h"                    // IsITimerExpired
 #include "comp.h"
-#include "misc.h"                       // AddToListboxBottom, AdjustCnrColRO, AdjustCnrColVis, AdjustCnrColsForPref
-                                        // AdjustDetailsSwitches, LoadDetailsSwitches, SetCnrCols
-                                        // SetDetailsSwitches
+#include "misc.h"               // AddToListboxBottom, AdjustCnrColRO, AdjustCnrColVis, AdjustCnrColsForPref
+                                        // AdjustDetailsSwitches, LoadDetailsSwitches, SetCnrCols
+                                        // SetDetailsSwitches
 #include "select.h"                     // Deselect, InvertAll
 #include "mkdir.h"                      // MassMkdir
@@ -88 +89 @@
 #include "walkem.h"                     // WalkTwoCmpDlgProc
 #include "fm3dll.h"
-#include "notebook.h"                   // External compare/dircompare
+#include "notebook.h"                   // External compare/dircompare
 
 #include "fortify.h"                    // 06 May 08 SHL
@@ -466 +467 @@
                         MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 
-      InitITimer(&itdSleep, 500);               // Sleep every 500 mSec
+      InitITimer(&itdSleep, 500);       // Sleep every 500 mSec
 
       while (pciS && (INT)pciS != -1 && pciD && (INT)pciD != -1) {
@@ -552 +553 @@
                   pciD->pszDisplayName++;
               }
-              // 02 Aug 07 SHL fixme to know if LongName transfer is correct?
               pciD->pszLongName = pciS->pszLongName;
+              pciS->pszLongName = NullStr;      // 07 Sep 08 SHL avoid aliased pointer
               if (pciD->pszSubject != NullStr) {
                 xfree(pciD->pszSubject, pszSrcFile, __LINE__);
@@ -631 +632 @@
                              pciS->pszFileName, szNewName);
               if (rc == MBID_CANCEL)
-                pciNextS = NULL;                // Cause loop to break
+                pciNextS = NULL;        // Cause loop to break
             }
             else {
@@ -891 +892 @@
       if (!*pciSa[x]->pszFileName || !*pciDa[x]->pszFileName) {
         // 12 Jan 08 SHL clear flags
-        pciSa[x]->flags = 0;    // File exists on one side only
+        pciSa[x]->flags = 0;            // File exists on one side only
         pciDa[x]->flags = 0;
         continue;
@@ -1319 +1320 @@
                  MPFROMP(pciDa), MPFROM2SHORT((min(numD, 65535)), 0));
       numS -= min(numS, 65535);
-      SleepIfNeeded(&itdSleep, 0); // 12 Jan 08 SHL
+      SleepIfNeeded(&itdSleep, 0);      // 12 Jan 08 SHL
     } // while
   }
@@ -1409 +1410 @@
           else if (fForceLower)
             strlwr(pffbFile->achName);
-          memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
-          if (strlen(maskstr) > CCHMAXPATH) {
+          memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
+          if (strlen(maskstr) > CCHMAXPATH) {
             // Complain if pathnames exceeds max
             DosFindClose(hDir);
-            free(pffbArray);
-            free(maskstr);
+            free(pffbArray);
+            free(maskstr);
             if (!fDone) {
               fDone = TRUE;
@@ -1421 +1422 @@
                      GetPString(IDS_WARNINGTEXT),
                      "One or more of your files has a full path name that exceeds the OS/2 maximum");
-            }
-            return;
+            }
+            return;
           }
           if (AddToFileList(maskstr + skiplen,
@@ -1965 +1966 @@
           } // if on both sides
 
-          if (x <= 0) {
+          if (x <= 0) {
             free(filesl[l++]);          // Done with item on left
-          }
-          if (x >= 0) {
-            free(filesr[r++]);          // Done with item on right
-          }
+          }
+          if (x >= 0) {
+            free(filesr[r++]);          // Done with item on right
+          }
           // Ensure empty buffers point somewhere
           if (!pcil->pszFileName) {
@@ -2019 +2020 @@
           }
           if (filesl) {
-            for(; filesl[l]; l++) {
-              free(filesl[l]);
-            }
+            for(; filesl[l]; l++) {
+              free(filesl[l]);
+            }
           }
           if (pcir) {
@@ -2031 +2032 @@
           }
           if (filesr) {
-            for (; filesr[r]; r++) {
-              free(filesr[r]);
-            }
+            for (; filesr[r]; r++) {
+              free(filesr[r]);
+            }
           }
           // Reduce count to match what is in containers
@@ -2039 +2040 @@
         } // if insufficient resources
 
-          xfree(filesl, pszSrcFile, __LINE__);                  // Free header - have already freed elements
+          xfree(filesl, pszSrcFile, __LINE__);  // Free header - have already freed elements
         filesl = NULL;
           xfree(filesr, pszSrcFile, __LINE__);
@@ -2146 +2147 @@
       WinSetWindowPtr(hwnd, QWL_USER, (PVOID)cmp);
       {
-        SWP swp;
-        ULONG size = sizeof(SWP);
-
-        PrfQueryProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp, &size);
-        WinSetWindowPos(hwnd,
-                        HWND_TOP,
-                        swp.x,
-                        swp.y,
-                        swp.cx,
-                        swp.cy,
-                        swp.fl);
+        SWP swp;
+        ULONG size = sizeof(SWP);
+
+        PrfQueryProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp, &size);
+        WinSetWindowPos(hwnd,
+                        HWND_TOP,
+                        swp.x,
+                        swp.y,
+                        swp.cx,
+                        swp.cy,
+                        swp.fl);
       }
       SetCnrCols(hwndLeft, TRUE);
@@ -2676 +2677 @@
                         GetPString(IDS_COULDNTSTARTTHREADTEXT));
           WinDismissDlg(hwnd, 0);
-          free(forthread);
-#         ifdef FORTIFY
-          Fortify_LeaveScope();
-#          endif
+          free(forthread);
+#         ifdef FORTIFY
+          Fortify_LeaveScope();
+#          endif
         }
         else {
@@ -2734 +2735 @@
       WinSetDlgItemText(hwnd, COMP_NOTE,
                         GetPString(IDS_COMPHOLDFILTERINGTEXT));
-      // cmp->dcd.suspendview = 1;              // 12 Jan 08 SHL appears not to be used here
+      // cmp->dcd.suspendview = 1;      // 12 Jan 08 SHL appears not to be used here
       priority_idle();                  // Don't hog resources
       WinSendMsg(hwndLeft, CM_FILTER, MPFROMP(Filter),
@@ -2741 +2742 @@
                  MPFROMP(&cmp->dcd.mask));
       priority_normal();
-      // cmp->dcd.suspendview = 0;              // 12 Jan 08 SHL appears not to be used here
+      // cmp->dcd.suspendview = 0;      // 12 Jan 08 SHL appears not to be used here
       if (*cmp->dcd.mask.szMask) {
         sprintf(s,
@@ -2759 +2760 @@
                                                   COMP_HIDENOTSELECTED);
 
-      // cmp->dcd.suspendview = 1;              // 12 Jan 08 SHL appears not to be used here
+      // cmp->dcd.suspendview = 1;      // 12 Jan 08 SHL appears not to be used here
       if (wasHidden != 1) {
         // Hide if not selected on both sides
@@ -2797 +2798 @@
                    MPFROMP(&cmp->dcd.mask));
       }
-      // cmp->dcd.suspendview = 0;              // 12 Jan 08 SHL appears not to be used here
+      // cmp->dcd.suspendview = 0;      // 12 Jan 08 SHL appears not to be used here
       if (*cmp->dcd.mask.szMask) {
         sprintf(s,
@@ -3074 +3075 @@
     case DID_OK:
       {
-        SWP swp;
-        ULONG size = sizeof(SWP);
-
-        WinQueryWindowPos(hwnd, &swp);
-        PrfWriteProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp,
-                            size);
+        SWP swp;
+        ULONG size = sizeof(SWP);
+
+        WinQueryWindowPos(hwnd, &swp);
+        PrfWriteProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp,
+                            size);
       }
       WinDismissDlg(hwnd, 0);
@@ -3085 +3086 @@
     case DID_CANCEL:
       {
-        SWP swp;
-        ULONG size = sizeof(SWP);
-
-        WinQueryWindowPos(hwnd, &swp);
-        PrfWriteProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp,
-                            size);
+        SWP swp;
+        ULONG size = sizeof(SWP);
+
+        WinQueryWindowPos(hwnd, &swp);
+        PrfWriteProfileData(fmprof, FM3Str, "CompDir.Position", (PVOID) &swp,
+                            size);
       }
       WinDismissDlg(hwnd, 1);