Changeset 1562

Timestamp:

May 29, 2011, 7:45:54 PM (14 years ago)

Author:

Gregg Young

Message:

Code clean up for collector trap on find dups

File:

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

trunk/dll/collect.c

@@ -654 +654 @@
       RECORDINSERT ri;
       ULONG ulMaxFiles;
-      ULONGLONG ullTotalBytes;
+      ULONGLONG ullTotalBytes, ullInitialTotalBytes;
       CHAR fullname[CCHMAXPATH];
       INT makeShort = 0;
@@ -666 +666 @@
           WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_COLLECTINGTEXT));
       }
+      ullInitialTotalBytes = dcd->ullTotalBytes;
       while (li->list[y]) {
-        for (ulMaxFiles = 0; li->list[ulMaxFiles + y] && ulMaxFiles < 65000; ulMaxFiles++) ;    // Count
+        for (ulMaxFiles = 0; li->list[ulMaxFiles + y] && ulMaxFiles < USHRT_MAX; ulMaxFiles++) ;        // Count
 
         if (ulMaxFiles) {
@@ -687 +688 @@
               hdir = HDIR_CREATE;
               DosError(FERR_DISABLEHARDERR);
-              if (!makeShort &&
+              if (ullInitialTotalBytes && !makeShort &&
                   FindCnrRecord(dcd->hwndCnr, li->list[x], NULL, FALSE, FALSE, TRUE)) {
                 pci = UpdateCnrRecord(dcd->hwndCnr, li->list[x], FALSE, dcd);
@@ -761 +762 @@
             }
           }
+        }
+        if (makeShort > 1000) {
+          Runtime_Error(pszSrcFile, __LINE__,
+                        "You have exceeded 650,000,000 files which probably means either a momory alocation or a list creation failure. Either way contact us.");
+          break;
         }
       } //While