Changeset 1846 for trunk/dll/arccnrs.c

Timestamp:

Aug 12, 2015, 10:31:54 PM (10 years ago)

Author:

John Small

Message:

Ticket #524: Ensure no "highmem-unsafe" functions are called directly
Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions.

File:

• trunk/dll/arccnrs.c (modified) (12 diffs)

trunk/dll/arccnrs.c

@@ -106 +106 @@
   06 Apr 14 GKY Removed all BZ/GZ checks
   28 Jun 14 GKY Fix errors identified with CPPCheck; Fix retry to create workdir code
+  12 Aug 15 JBS Ticket #524: Ensure no "highmem-unsafe" functions are called directly
+                Calls to unsafe Dos... functions have been changed to call the wrapped xDos... functions
 
 ***********************************************************************/
@@ -591 +593 @@
   CHAR lonename[CCHMAXPATH + 2],
        *nsize, *osize, *fdate, *fname, *p, *pp, *arctemp;
-  // Change the DosQueryAppType call below to xDosQueryAppType if "s" is no longer in low memory
   CHAR s[CCHMAXPATH * 2];
-  CHAR TestStr[CCHMAXPATH * 2]; 
+  CHAR TestStr[CCHMAXPATH * 2];
   BOOL gotstart;
   BOOL gotend;
@@ -606 +607 @@
   APIRET rc;
   CHAR *mode;
-  ULONG cnter = 0; 
+  ULONG cnter = 0;
 
   if (!arcname || !arcinfo)
@@ -659 +660 @@
       *p = 0;
     DosError(FERR_DISABLEHARDERR);
-    if (!DosQueryAppType(s, &apptype) &&
+    if (!xDosQueryAppType(s, &apptype) &&
         (apptype & FAPPTYP_DOS ||
          apptype & FAPPTYP_WINDOWSREAL ||
@@ -701 +702 @@
           }
           else {
-            rc = 0; 
+            rc = 0;
             //DbgMsg(pszSrcFile, __LINE__, "Number of tries %i", cnter);
             rc = SearchPathForFile(PCSZ_PATH, s, NULL);
@@ -711 +712 @@
                       info->list,
                       BldQuotedFileName(s, arcname));
-              if (cnter == 1) { 
+              if (cnter == 1) {
                 if (info->test)
                   strcpy(TestStr, info->test);
@@ -944 +945 @@
           if (tinfo) {
             DosError(FERR_DISABLEHARDERR);
-            DosForceDelete(arctemp);
+            xDosForceDelete(arctemp);
             info = tinfo;
             goto ReTry;
@@ -952 +953 @@
           DosBeep(750, 50);             // wake up user
 
-        if (cnter > 0) { 
+        if (cnter > 0) {
           CHAR Temp[CCHMAXPATH + 2];
 
@@ -965 +966 @@
           strcpy(ad.listname, arctemp);
           strcpy(ad.arcname, arcname);
-          if (!notest) { 
+          if (!notest) {
             strcpy(Temp, info->test);
             info->test = xstrdup(TestStr, pszSrcFile, __LINE__);
@@ -980 +981 @@
             info->test = xstrdup(Temp, pszSrcFile, __LINE__);
         }
-        else 
+        else
           saymsg(MB_OK, HWND_DESKTOP, GetPString(IDS_ARCMISSINGEXE),
                  GetPString(IDS_ARCMISSINGEXEVERBOSE));
@@ -999 +1000 @@
 
     DosError(FERR_DISABLEHARDERR);
-    DosForceDelete(arctemp);
+    xDosForceDelete(arctemp);
     xfree(arctemp, pszSrcFile, __LINE__);
   }
@@ -1008 +1009 @@
   return numarcfiles;
 } // FillArcCnr
+
 MRESULT EXPENTRY ArcTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {