Changeset 66861 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

May 10, 2017 12:56:16 PM (8 years ago)

Author:

vboxsync

Message:

RTGetOptArgvFromString: Fixed incorrect handling of escape sequences inside double quotes in bourne shell mode. Only double quote, backslash, backtick, dollar and newline are valid characters to escape.

File:

• trunk/src/VBox/Runtime/common/misc/getoptargv.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/misc/getoptargv.cpp

@@ -276 +276 @@
          * Parse and copy the string over.
          */
-        RTUNICP Cp;
+        RTUNICP uc;
         if ((fFlags & RTGETOPTARGV_CNV_QUOTE_MASK) == RTGETOPTARGV_CNV_QUOTE_BOURNE_SH)
         {
@@ -282 +282 @@
              * Bourne shell style.
              */
-            RTUNICP CpQuote = 0;
+            RTUNICP ucQuote = 0;
             for (;;)
             {
-                rc = RTStrGetCpEx(&pszSrc, &Cp);
-                if (RT_FAILURE(rc) || !Cp)
+                rc = RTStrGetCpEx(&pszSrc, &uc);
+                if (RT_FAILURE(rc) || !uc)
                     break;
-                if (!CpQuote)
-                {
-                    if (Cp == '"' || Cp == '\'')
-                        CpQuote = Cp;
-                    else if (rtGetOptIsCpInSet(Cp, pszSeparators, cchSeparators))
+                if (!ucQuote)
+                {
+                    if (uc == '"' || uc == '\'')
+                        ucQuote = uc;
+                    else if (rtGetOptIsCpInSet(uc, pszSeparators, cchSeparators))
                         break;
-                    else if (Cp != '\\')
-                        pszDst = RTStrPutCp(pszDst, Cp);
+                    else if (uc != '\\')
+                        pszDst = RTStrPutCp(pszDst, uc);
                     else
                     {
                         /* escaped char */
-                        rc = RTStrGetCpEx(&pszSrc, &Cp);
-                        if (RT_FAILURE(rc) || !Cp)
+                        rc = RTStrGetCpEx(&pszSrc, &uc);
+                        if (RT_FAILURE(rc) || !uc)
                             break;
-                        pszDst = RTStrPutCp(pszDst, Cp);
+                        pszDst = RTStrPutCp(pszDst, uc);
                     }
                 }
-                else if (CpQuote != Cp)
-                {
-                    if (Cp != '\\' || CpQuote == '\'')
-                        pszDst = RTStrPutCp(pszDst, Cp);
+                else if (ucQuote != uc)
+                {
+                    if (uc != '\\' || ucQuote == '\'')
+                        pszDst = RTStrPutCp(pszDst, uc);
                     else
                     {
                         /* escaped char */
-                        rc = RTStrGetCpEx(&pszSrc, &Cp);
-                        if (RT_FAILURE(rc) || !Cp)
+                        rc = RTStrGetCpEx(&pszSrc, &uc);
+                        if (RT_FAILURE(rc) || !uc)
                             break;
-                        pszDst = RTStrPutCp(pszDst, Cp);
+                        if (   uc != '"'
+                            && uc != '\\'
+                            && uc != '`'
+                            && uc != '$'
+                            && uc != '\n')
+                            pszDst = RTStrPutCp(pszDst, ucQuote);
+                        pszDst = RTStrPutCp(pszDst, uc);
                     }
                 }
                 else
-                    CpQuote = 0;
+                    ucQuote = 0;
             }
         }
@@ -331 +337 @@
             for (;;)
             {
-                rc = RTStrGetCpEx(&pszSrc, &Cp);
-                if (RT_FAILURE(rc) || !Cp)
+                rc = RTStrGetCpEx(&pszSrc, &uc);
+                if (RT_FAILURE(rc) || !uc)
                     break;
-                if (Cp == '"')
+                if (uc == '"')
                 {
                     /* Two double quotes insides a quoted string in an escape
@@ -349 +355 @@
                     }
                 }
-                else if (!fInQuote && rtGetOptIsCpInSet(Cp, pszSeparators, cchSeparators))
+                else if (!fInQuote && rtGetOptIsCpInSet(uc, pszSeparators, cchSeparators))
                     break;
-                else if (Cp != '\\')
-                    pszDst = RTStrPutCp(pszDst, Cp);
+                else if (uc != '\\')
+                    pszDst = RTStrPutCp(pszDst, uc);
                 else
                 {
@@ -387 +393 @@
 
         *pszDst++ = '\0';
-        if (RT_FAILURE(rc) || !Cp)
+        if (RT_FAILURE(rc) || !uc)
             break;
     }