RepoVarExpand: Fix expansion of embedded words with invalid variable …

…definitions An incomplete variable definition is to be expanded literally. It should produce the same result as if the the introducing '$' was escaped.
openSUSE · Dec 15, 2023 · 9ce8905 · 9ce8905
1 parent 9d4853e
commit 9ce8905
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tests/repo/RepoVariables_test.cc b/tests/repo/RepoVariables_test.cc
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(RepVarExpand)
   RepVarExpandTest( "$_A_B:"                                , "$_A_B:"                                , "[_A_B]:"                                );
   RepVarExpandTest( "${C:+a$Bba\\}"                         , "${C:+a$Bba\\}"                         , "${C:+a[Bba]\\}"                         );
   RepVarExpandTest( "${C:+a$Bba}"                           , ""                                      , "a[Bba]"                                 );
-  RepVarExpandTest( "${C:+a${B\\}ba}"                       , "${C:+a${B\\}ba}"                       , "${C:+a${B\\}ba}"                        );
+  RepVarExpandTest( "${C:+a${B\\}ba}"                       , ""                                      , "a${B}ba"                                );
   RepVarExpandTest( "${C:+a${B}ba}"                         , ""                                      , "a[B]ba"                                 );
   RepVarExpandTest( "${C:+a\\$Bba}"                         , ""                                      , "a$Bba"                                  );
   RepVarExpandTest( "${C:+a\\${B\\}ba}"                     , ""                                      , "a${B}ba"                                );

diff --git a/zypp/repo/RepoVariables.cc b/zypp/repo/RepoVariables.cc
@@ -228,8 +228,10 @@ namespace zypp
                   else if ( *scan == '$' )
                   {
                     // an embedded var?
-                    if ( ! (scan = findVarEnd( scan )) )
-                      return false;
+                    if ( const char * scanEnd = findVarEnd( scan ) )
+                      scan = scanEnd;
+                    else
+                      ++scan; // no valid var: treated as literal
                   }
                   else if ( *scan == '}' )
                   {