Changeset 78153 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Apr 17, 2019 12:30:08 PM (6 years ago)

Author:

vboxsync

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

130068

Message:

IPRT: Added RTPATHABS_F_ENSURE_TRAILING_SLASH to RTPathAbsEx and fixed a couple of issues related to VERR_BUFFER_OVERFLOW code paths. bugref:9172

Location:

trunk/src/VBox/Runtime/r3

Files:

• dir.cpp (modified) (4 diffs)
• win/path-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -543 +543 @@
 
         cbFilter = cucFilter0 = 0;
-        pszAbsPath = RTPathAbsDup(pszPath);
+        pszAbsPath = RTPathAbsExDup(NULL, pszPath, RTPATHABS_F_ENSURE_TRAILING_SLASH);
     }
     else
@@ -557 +557 @@
                 return VERR_NO_MEMORY;
             pszTmp[pszFilter - pszPath] = '\0';
-            pszAbsPath = RTPathAbsDup(pszTmp);
+            pszAbsPath = RTPathAbsExDup(NULL, pszTmp, RTPATHABS_F_ENSURE_TRAILING_SLASH);
             RTStrFree(pszTmp);
         }
         else
-            pszAbsPath = RTPathAbsDup(".");
+            pszAbsPath = RTPathAbsExDup(NULL, ".", RTPATHABS_F_ENSURE_TRAILING_SLASH);
         fDirSlash = true;
     }
     if (!pszAbsPath)
         return VERR_NO_MEMORY;
-
-
+    Assert(strchr(pszAbsPath, '\0')[-1] == RTPATH_SLASH);
 
     /*
@@ -576 +575 @@
      */
     size_t const cchAbsPath      = strlen(pszAbsPath);
-    size_t const cchAbsPathExtra = !RTPATH_IS_SEP(pszAbsPath[cchAbsPath - 1]) ? 1 : 0; /* add trailing '/' if missing */
     size_t const cbDir           = rtDirNativeGetStructSize(pszAbsPath);
     size_t const cbAllocated     = cbDir
                                  + cucFilter0 * sizeof(RTUNICP)
                                  + cbFilter
-                                 + cchAbsPath + cchAbsPathExtra + 1 + 4;
+                                 + cchAbsPath + 1 + 4;
     PRTDIRINTERNAL pDir = (PRTDIRINTERNAL)RTMemAllocZ(cbAllocated);
     if (!pDir)
@@ -627 +625 @@
             break;
     }
-    pDir->cchPath       = cchAbsPath + cchAbsPathExtra;
+    pDir->cchPath       = cchAbsPath;
     pDir->pszPath       = (char *)memcpy(pb, pszAbsPath, cchAbsPath);
-    pb[cchAbsPath]                   = RTPATH_SLASH;
-    pb[cchAbsPath + cchAbsPathExtra] = '\0';
-    Assert(pb - (uint8_t *)pDir + cchAbsPath + cchAbsPathExtra + 1 <= cbAllocated);
+    pb[cchAbsPath]      = '\0';
+    Assert(pb - (uint8_t *)pDir + cchAbsPath + 1 <= cbAllocated);
     pDir->pszName       = NULL;
     pDir->cchName       = 0;

trunk/src/VBox/Runtime/r3/win/path-win.cpp

@@ -671 +671 @@
     int rc;
 
-    /*
-     * GetCurrentDirectory may in some cases omit the drive letter, according
-     * to MSDN, thus the GetFullPathName call.
-     */
-    RTUTF16 wszCurPath[RTPATH_MAX];
-    if (GetCurrentDirectoryW(RTPATH_MAX, wszCurPath))
-    {
-        RTUTF16 wszFullPath[RTPATH_MAX];
-        if (GetFullPathNameW(wszCurPath, RTPATH_MAX, wszFullPath, NULL))
-            rc = RTUtf16ToUtf8Ex(&wszFullPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
+    if (cchPath > 0)
+    {
+        /*
+         * GetCurrentDirectory may in some cases omit the drive letter, according
+         * to MSDN, thus the GetFullPathName call.
+         */
+        RTUTF16 wszCurPath[RTPATH_MAX];
+        if (GetCurrentDirectoryW(RTPATH_MAX, wszCurPath))
+        {
+            RTUTF16 wszFullPath[RTPATH_MAX];
+            if (GetFullPathNameW(wszCurPath, RTPATH_MAX, wszFullPath, NULL))
+                rc = RTUtf16ToUtf8Ex(&wszFullPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
+            else
+                rc = RTErrConvertFromWin32(GetLastError());
+        }
         else
             rc = RTErrConvertFromWin32(GetLastError());
     }
     else
-        rc = RTErrConvertFromWin32(GetLastError());
+        rc = VERR_BUFFER_OVERFLOW;
     return rc;
 }
@@ -724 +729 @@
 RTDECL(int) RTPathGetCurrentOnDrive(char chDrive, char *pszPath, size_t cbPath)
 {
-    WCHAR wszInput[4];
-    wszInput[0] = chDrive;
-    wszInput[1] = ':';
-    wszInput[2] = '\0';
-
     int rc;
-    RTUTF16 wszFullPath[RTPATH_MAX];
-    if (GetFullPathNameW(wszInput, RTPATH_MAX, wszFullPath, NULL))
-        rc = RTUtf16ToUtf8Ex(&wszFullPath[0], RTSTR_MAX, &pszPath, cbPath, NULL);
+    if (cbPath > 0)
+    {
+        WCHAR wszInput[4];
+        wszInput[0] = chDrive;
+        wszInput[1] = ':';
+        wszInput[2] = '\0';
+        RTUTF16 wszFullPath[RTPATH_MAX];
+        if (GetFullPathNameW(wszInput, RTPATH_MAX, wszFullPath, NULL))
+            rc = RTUtf16ToUtf8Ex(&wszFullPath[0], RTSTR_MAX, &pszPath, cbPath, NULL);
+        else
+            rc = RTErrConvertFromWin32(GetLastError());
+    }
     else
-        rc = RTErrConvertFromWin32(GetLastError());
+        rc = VERR_BUFFER_OVERFLOW;
     return rc;
 }