Changeset 1846 for trunk/dll/sysinfo.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/sysinfo.c (modified) (3 diffs)

trunk/dll/sysinfo.c

@@ -19 +19 @@
   20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
                 by temp file creation failures.
+  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
 
 ***********************************************************************/
@@ -74 +76 @@
     else {
       newstdout = -1;
-      if (DosDupHandle(fileno(stdout), &newstdout)) {
+      if (xDosDupHandle(fileno(stdout), &newstdout)) {
         fclose(fp);
         goto Abort;
       }
       oldstdout = fileno(stdout);
-      DosDupHandle(fileno(fp), &oldstdout);
+      xDosDupHandle(fileno(fp), &oldstdout);
       runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
               hwnd, pszSrcFile, __LINE__,
               NULL, NULL, "%s", szTempFile);
       oldstdout = fileno(stdout);
-      DosDupHandle(newstdout, &oldstdout);
+      xDosDupHandle(newstdout, &oldstdout);
       DosClose(newstdout);
       fclose(fp);
@@ -120 +122 @@
   }
   if (szTempFile)
-    DosForceDelete(szTempFile);
+    xDosForceDelete(szTempFile);
 }