summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-09-06 15:14:38 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-10-02 12:14:13 +0200
commit99f15f1706868c4b2f84bc4164451bd69b3b8188 (patch)
treec1867b11258d4b5d35750c2ff3270aff01ce1e72 /src/shared
parentcd4c4218e498aa9078cd672491f17fe96a569e45 (diff)
downloadqt-creator-99f15f1706868c4b2f84bc4164451bd69b3b8188.tar.gz
ProParser: Plug raw data leak
QProcessEnvironment caches keys, so we must not pass it QStrings created with fromRawData() Task-number: QTCREATORBUG-9142 Change-Id: I29fade02f3bc4110fafb1b04d44f2e653951a2ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/proparser/qmakeevaluator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 569145dac2..ed1d0a619e 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -453,7 +453,7 @@ void QMakeEvaluator::evaluateExpression(
break; }
case TokEnvVar: {
const ProString &var = getStr(tokPtr);
- const ProString &val = ProString(m_option->getEnv(var.toQString(m_tmp1)));
+ const ProString &val = ProString(m_option->getEnv(var.toQString()));
debugMsg(2, "env var %s => %s", dbgStr(var), dbgStr(val));
addStr(val, ret, pending, joined);
break; }