Changeset 78153 in vbox for trunk/src/VBox/Runtime/r3/dir.cpp

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

File:

• trunk/src/VBox/Runtime/r3/dir.cpp (modified) (4 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;