Changeset 84855 in vbox for trunk/src/VBox/ValidationKit/utils/TestExecServ

Timestamp:

Jun 16, 2020 8:03:06 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138673

Message:

Validation Kit/TXS: Fixed a bug in txsReplaceStringVariables() where unsupported string variables like $FOO will lead to an infinite loop.

File:

• trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp (modified) (2 diffs)

trunk/src/VBox/ValidationKit/utils/TestExecServ/TestExecService.cpp

@@ -553 +553 @@
     char   *pszNew    = RTStrDup(pszSrc);
     char   *pszDollar = pszNew;
-    while ((pszDollar = strchr(pszDollar, '$')) != NULL)
-    {
-        /** @todo employ $$ as escape sequence here. */
+    while (pszDollar && (pszDollar = strchr(pszDollar, '$')) != NULL)
+    {
         if (pszDollar[1] == '{')
         {
@@ -639 +638 @@
             cchNew -= 1;
         }
+        else /* No match, move to next char to avoid endless looping. */
+            pszDollar++;
     }