summaryrefslogtreecommitdiff
path: root/share/qbs/imports/qbs/DarwinTools
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@intopalo.com>2016-05-08 20:45:04 +0300
committerAndrew Knight <andrew.knight@intopalo.com>2016-05-09 06:59:42 +0000
commitbc715077d0a1a389bb1087babb2002edd691b1a1 (patch)
tree33205480f2bc083d047744ad00f11f2d048af2b4 /share/qbs/imports/qbs/DarwinTools
parent47d6d826964725ab3e34edcd6c863a4a29c0cf56 (diff)
downloadqbs-bc715077d0a1a389bb1087babb2002edd691b1a1.tar.gz
Fix a potential infinite loop when expanding plist environment variables
Change-Id: Idf7990c1799b9abfa364375ef522ac47a341f4d5 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/DarwinTools')
-rw-r--r--share/qbs/imports/qbs/DarwinTools/darwin-tools.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
index ad67dc16b..6f0c1f8d8 100644
--- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
+++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
@@ -199,6 +199,7 @@ function expandPlistEnvironmentVariables(obj, env, warn) {
// skip replacement
if (warn)
console.warn("undefined variable " + varName + " in variable expansion");
+ i = j + repl.syntax.close.length;
} else {
changes = true;
varValue = String(varValue);