1 files changed, 3 insertions, 1 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;