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

Timestamp:

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

Author:

vboxsync

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

File:

• trunk/src/VBox/Runtime/r3/win/path-win.cpp (modified) (2 diffs)

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;
 }