Changeset 69984 in vbox for trunk/src/VBox/Runtime/common/vfs

Timestamp:

Dec 7, 2017 3:36:52 PM (7 years ago)

Author:

vboxsync

Message:

iprt/vfschain: Fixed anther parser escape thingy

File:

• trunk/src/VBox/Runtime/common/vfs/vfschain.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/vfs/vfschain.cpp

@@ -656 +656 @@
  *
  * @returns The offset of the end character relative to @a psz.
- * @param   psz                 The argument string.
+ * @param   psz             The argument string.
+ * @param   chCloseParen    The closing parenthesis.
  */
-static size_t rtVfsChainSpecFindArgEnd(const char *psz)
+static size_t rtVfsChainSpecFindArgEnd(const char *psz, char const chCloseParen)
 {
     size_t off = 0;
@@ -664 +665 @@
     while (  (ch = psz[off]) != '\0'
            && ch != ','
-           && ch != ')'
-           && ch != '}')
+           && ch != chCloseParen)
     {
         if (   ch == '\\'
@@ -778 +778 @@
             break;
         }
+        char const chCloseParen = (chOpenParen == '(' ? ')' : '}');
         pszSrc = RTStrStripL(pszSrc + cch + 1);
 
@@ -783 +784 @@
          * The name of the element provider.
          */
-        cch = rtVfsChainSpecFindArgEnd(pszSrc);
+        cch = rtVfsChainSpecFindArgEnd(pszSrc, chCloseParen);
         if (!cch)
         {
@@ -800 +801 @@
         {
             pszSrc = RTStrStripL(pszSrc + 1);
-            cch = rtVfsChainSpecFindArgEnd(pszSrc);
+            cch = rtVfsChainSpecFindArgEnd(pszSrc, chCloseParen);
             rc = rtVfsChainSpecElementAddArg(pElement, pszSrc, cch, (uint16_t)(pszSrc - pszSpec));
             if (RT_FAILURE(rc))
@@ -810 +811 @@
 
         /* Must end with a right parentheses/curly. */
-        if (*pszSrc != (chOpenParen == '(' ? ')' : '}'))
+        if (*pszSrc != chCloseParen)
         {
             rc = VERR_VFS_CHAIN_EXPECTED_RIGHT_PARENTHESES;