Changeset 1000

Timestamp:

Mar 16, 2008, 10:46:11 PM (17 years ago)

Author:

Gregg Young

Message:

Prevent trap and provide error message when file names that exceed maxpath are encountered (ticket 223)

File:

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

trunk/dll/comp.c ¶

@@ -53 +53 @@
   29 Feb 08 GKY Use xfree where appropriate
   29 Feb 08 GKY Refactor global command line variables to notebook.h
+  16 Mar 08 GKY Prevent trap caused by files that exceed maxpath length
 
 ***********************************************************************/
@@ -1315 +1316 @@
   ULONG ulBufBytes = sizeof(FILEFINDBUF4L) * FilesToGet;
   APIRET rc;
+  static BOOL fDone;
 
   if (!str || !*str) {
@@ -1323 +1325 @@
   // DbgMsg(pszSrcFile, __LINE__, "FillDirList start %s", str);
 
-  maskstr = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
+  maskstr = xmalloc(CCHMAXPATH + 100, pszSrcFile, __LINE__);
   if (!maskstr)
     return;
@@ -1372 +1374 @@
           else if (fForceLower)
             strlwr(pffbFile->achName);
-          memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
+          memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
+          if (strlen(maskstr) > CCHMAXPATH) {
+            // Complain if pathnames exceeds max
+            DosFindClose(hDir);
+            xfree(pffbArray);
+            xfree(maskstr);
+            if (!fDone) {
+              fDone = TRUE;
+              saymsg(MB_OK | MB_ICONASTERISK,
+                     HWND_DESKTOP,
+                     GetPString(IDS_WARNINGTEXT),
+                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+            }
+            return;
+          }
           if (AddToFileList(maskstr + skiplen,
                             pffbFile, list, pnumfiles, pnumalloc)) {