Changeset 41429 in vbox for trunk/src/VBox/HostDrivers/Support/testcase

Timestamp:

May 24, 2012 9:38:38 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78155

Message:

tstInt: use absolute path because of hardening

File:

• trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp

@@ -40 +40 @@
 #include <iprt/alloc.h>
 #include <iprt/time.h>
-
-
-/**
- * Makes a path to a file in the executable directory.
- */
-static char *ExeDirFile(char *pszFile, const char *pszArgv0, const char *pszFilename)
-{
-    char   *psz;
-    char   *psz2;
-
-    strcpy(pszFile, pszArgv0);
-    psz = strrchr(pszFile, '/');
-    psz2 = strrchr(pszFile, '\\');
-    if (psz < psz2)
-        psz = psz2;
-    if (!psz)
-        psz = strrchr(pszFile, ':');
-    if (!psz)
-    {
-        strcpy(pszFile, "./");
-        psz = &pszFile[1];
-    }
-    strcpy(psz + 1, "VMMR0.r0");
-    return pszFile;
-}
+#include <iprt/path.h>
+
 
 int main(int argc, char **argv)
@@ -83 +60 @@
     rcRet += rc != 0;
     RTPrintf("tstInt: SUPR3Init -> rc=%Rrc\n", rc);
+    char szFile[RTPATH_MAX];
     if (!rc)
+    {
+        rc = RTPathExecDir(szFile, sizeof(szFile) - sizeof("/VMMR0.r0"));
+    }
+    char szAbsFile[RTPATH_MAX];
+    if (RT_SUCCESS(rc))
+    {
+        strcat(szFile, "/VMMR0.r0");
+        rc = RTPathAbs(szFile, szAbsFile, sizeof(szAbsFile));
+    }
+    if (RT_SUCCESS(rc))
     {
         /*
          * Load VMM code.
          */
-        char    szFile[RTPATH_MAX];
-        rc = SUPR3LoadVMM(ExeDirFile(szFile, argv[0], "VMMR0.r0"));
-        if (!rc)
+        rc = SUPR3LoadVMM(szAbsFile);
+        if (RT_SUCCESS(rc))
         {
             /*