feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

plug raw data leaks

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-06-15 20:50:21 +02:00
parent f344504d8b
commit ebb4e044a7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/proparser/profileevaluator.cpp
View File

@@ -3012,7 +3012,9 @@ ProStringList ProFileEvaluator::Private::evaluateExpandFunction(
logMessage(format("fromfile(file, variable) requires two arguments."));
} else {
QHash<ProString, ProStringList> vars;
if (evaluateFileInto(resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1))), &vars, 0))
QString fn = resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach();
if (evaluateFileInto(fn, &vars, 0))
ret = vars.value(map(args.at(1)));
}
break;
@@ -3290,7 +3292,9 @@ ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateCondit
logMessage(format("infile(file, var, [values]) requires two or three arguments."));
} else {
QHash<ProString, ProStringList> vars;
if (!evaluateFileInto(resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1))), &vars, 0))
QString fn = resolvePath(expandEnvVars(args.at(0).toQString(m_tmp1)));
fn.detach();
if (!evaluateFileInto(fn, &vars, 0))
return ReturnFalse;
if (args.count() == 2)
return returnBool(vars.contains(args.at(1)));