Changeset 78153 in vbox for trunk/src/VBox/Runtime/common/path/RTPathAbsEx.cpp

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/common/path/RTPathAbsEx.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/common/path/RTPathAbsEx.cpp

@@ -185 +185 @@
     {
         Assert(pBaseParsed->cComps > 1);
-        if (iLast >= 0 || (pParsed->fProps & RTPATH_PROP_DIR_SLASH))
+        if (   iLast >= 0
+            || (pParsed->fProps & RTPATH_PROP_DIR_SLASH)
+            || (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH) )
             pBaseParsed->fProps |= RTPATH_PROP_DIR_SLASH;
         else
@@ -191 +193 @@
     }
 
+    /* Apply the trailing flash flag to the input path: */
+    if (   iLast >= 0
+        && (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH))
+        pParsed->fProps |= RTPATH_PROP_DIR_SLASH;
+
     /*
      * Combine the two.  RTPathParsedReassemble can handle in place stuff, as
@@ -207 +214 @@
             rc = RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK,
                                         &pszAbsPath[cchBaseInPlace], *pcbAbsPath - cchBaseInPlace);
-            *pcbAbsPath = cchBaseInPlace + pParsed->cchPath;
             if (RT_SUCCESS(rc))
+            {
+                *pcbAbsPath = cchBaseInPlace + pParsed->cchPath;
                 Assert(*pcbAbsPath == strlen(pszAbsPath));
+            }
+            else
+                *pcbAbsPath = cchBaseInPlace + pParsed->cchPath + 1;
         }
         else
@@ -219 +230 @@
         {
             RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK, pszAbsPath, 0);
-            *pcbAbsPath = pBaseParsed->cchPath + pParsed->cchPath;
+            *pcbAbsPath = pBaseParsed->cchPath + pParsed->cchPath + 1;
         }
         else
-            *pcbAbsPath = pBaseParsed->cchPath;
+            *pcbAbsPath = pBaseParsed->cchPath + 1;
     }
 
@@ -448 +459 @@
         i++;
     }
+
+    /*
+     * Before we continue, ensure trailing slash if requested.
+     */
+    if (   (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH)
+        && iLast > 0)
+        pParsed->fProps |= RTPATH_PROP_DIR_SLASH;
 
     /*
@@ -527 +545 @@
                 {
                     int rc2 = RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK, pszAbsPath, 0);
-                    Assert(rc2 == VERR_BUFFER_OVERFLOW); RT_NOREF(rc2);
+                    Assert(rc2 == VERR_BUFFER_OVERFLOW);
 
                     char *pszTmp = (char *)RTMemTmpAlloc(RTPATH_BIG_MAX);
                     if (pszTmp)
                     {
-                        rc = RTPathGetCurrentDrive(pszTmp, RTPATH_BIG_MAX);
-                        if (RT_SUCCESS(rc))
+                        rc2 = RTPathGetCurrentDrive(pszTmp, RTPATH_BIG_MAX);
+                        if (RT_SUCCESS(rc2))
                             *pcbAbsPath = strlen(pszTmp) + pParsed->cchPath + 1;
                         else
@@ -570 +588 @@
                 pParsed->aComps[i].cch = 0;
     }
+
+    if (   (fFlags & RTPATHABS_F_ENSURE_TRAILING_SLASH)
+        && pParsed->cComps > 1)
+        pParsed->fProps |= RTPATH_PROP_DIR_SLASH;
+
     int rc = RTPathParsedReassemble(pszPath, pParsed, fFlags & RTPATH_STR_F_STYLE_MASK, pszAbsPath, *pcbAbsPath);
     *pcbAbsPath = pParsed->cchPath + (rc == VERR_BUFFER_OVERFLOW);
@@ -589 +612 @@
 
     AssertCompile(RTPATH_STR_F_STYLE_HOST == 0);
-    AssertReturn(   RTPATH_STR_F_IS_VALID(fFlags, RTPATHABS_F_STOP_AT_BASE | RTPATHABS_F_STOP_AT_CWD)
+    AssertReturn(   RTPATH_STR_F_IS_VALID(fFlags, RTPATHABS_F_STOP_AT_BASE | RTPATHABS_F_STOP_AT_CWD | RTPATHABS_F_ENSURE_TRAILING_SLASH)
                  && !(fFlags & RTPATH_STR_F_MIDDLE), VERR_INVALID_FLAGS);
     if ((fFlags & RTPATH_STR_F_STYLE_MASK) == RTPATH_STR_F_STYLE_HOST)