Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
ebb4e044
Commit
ebb4e044
authored
Jun 15, 2010
by
Oswald Buddenhagen
Browse files
plug raw data leaks
parent
f344504d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/shared/proparser/profileevaluator.cpp
View file @
ebb4e044
...
...
@@ -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
)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment