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

MacroExpander: Prevent loop with subproviders

Browse Source 
Prevent a loop where a subprovider of a macroexpander creates
the macroexpander itself.

Change-Id: Id2f3e29651aeb22c818091d8c785a6ea01545463
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-06-07 16:50:04 +02:00
parent ba8e7d1156
commit 4e96f2ce22
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/utils/macroexpander.cpp
View File

@@ -53,16 +53,22 @@ public:
: m_accumulating(false), m_aborted(false), m_lockDepth(0)
{}
bool resolveMacro(const QString &name, QString *ret)
bool resolveMacro(const QString &name, QString *ret, QSet<AbstractMacroExpander *> &seen)
{
// Prevent loops:
const int count = seen.count();
seen.insert(this);
if (seen.count() == count)
return false;
bool found;
*ret = value(name.toUtf8(), &found);
if (found)
return true;
found = Utils::anyOf(m_subProviders, [name, ret] (const MacroExpanderProvider &p) -> bool {
found = Utils::anyOf(m_subProviders, [name, ret, &seen] (const MacroExpanderProvider &p) -> bool {
MacroExpander *expander = p ? p() : 0;
return expander && expander->resolveMacro(name, ret);
return expander && expander->d->resolveMacro(name, ret, seen);
});
if (found)
@@ -75,7 +81,7 @@ public:
if (found)
return true;
return this == globalMacroExpander()->d ? false : globalMacroExpander()->d->resolveMacro(name, ret);
return this == globalMacroExpander()->d ? false : globalMacroExpander()->d->resolveMacro(name, ret, seen);
}
QString value(const QByteArray &variable, bool *found)
@@ -243,7 +249,8 @@ MacroExpander::~MacroExpander()
*/
bool MacroExpander::resolveMacro(const QString &name, QString *ret) const
{
return d->resolveMacro(name, ret);
QSet<AbstractMacroExpander*> seen;
return d->resolveMacro(name, ret, seen);
}
/*!