refactor: Avoid changing loop variable in body of for loop

This is to please CodeQL's "For loop variable changed in body" check.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/Util.cpp b/src/Util.cpp
index bdcc9117..eaac8b95 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -438,7 +438,8 @@ expand_environment_variables(const std::string& str)
 {
   std::string result;
   const char* left = str.c_str();
-  for (const char* right = left; *right; ++right) {
+  const char* right = left;
+  while (*right) {
     if (*right == '$') {
       result.append(left, right - left);
 
@@ -471,6 +472,7 @@ expand_environment_variables(const std::string& str)
         left = right + 1;
       }
     }
+    ++right;
   }
   result += left;
   return result;
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 7f178415..3a03a0be 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -134,7 +134,8 @@ percent_decode(std::string_view string)
 
   std::string result;
   result.reserve(string.size());
-  for (size_t i = 0; i < string.size(); ++i) {
+  size_t i = 0;
+  while (i < string.size()) {
     if (string[i] != '%') {
       result += string[i];
     } else if (i + 2 >= string.size() || !std::isxdigit(string[i + 1])
@@ -147,6 +148,7 @@ percent_decode(std::string_view string)
       result += ch;
       i += 2;
     }
+    ++i;
   }
 
   return result;