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

Prevent indefinite recursion in macro expansion

Browse Source 
Task-number: QTCREATORBUG-13315
Change-Id: Ibf963569bdebf8a791f0a7ceb8cd010efed99dad
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
hjk
2014-11-05 11:47:11 +01:00
parent 2d7af0d732
commit 1c12b30bef
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@
****************************************************************************/ ****************************************************************************/
#include "macroexpander.h" #include "macroexpander.h"
#include "qtcassert.h"
#include "qtcprocess.h" #include "qtcprocess.h"
#include "algorithm.h" #include "algorithm.h"
@@ -49,7 +50,7 @@ const char kFileBaseNamePostfix[] = ":FileBaseName";
class MacroExpanderPrivate : public AbstractMacroExpander class MacroExpanderPrivate : public AbstractMacroExpander
{ {
public: public:
MacroExpanderPrivate() : m_accumulating(false) {} MacroExpanderPrivate() : m_accumulating(false), m_lockDepth(0) {}
bool resolveMacro(const QString &name, QString *ret) bool resolveMacro(const QString &name, QString *ret)
{ {
@@ -108,6 +109,8 @@ public:
QVector<MacroExpanderProvider> m_subProviders; QVector<MacroExpanderProvider> m_subProviders;
QVector<MacroExpander *> m_subExpanders; // Not owned QVector<MacroExpander *> m_subExpanders; // Not owned
bool m_accumulating; bool m_accumulating;
int m_lockDepth;
}; };
} // Internal } // Internal
@@ -261,8 +264,16 @@ QString MacroExpander::value(const QByteArray &variable, bool *found) const
*/ */
QString MacroExpander::expand(const QString &stringWithVariables) const QString MacroExpander::expand(const QString &stringWithVariables) const
{ {
if (d->m_lockDepth > 3) // Limit recursion.
return QString();
++d->m_lockDepth;
QString res = stringWithVariables; QString res = stringWithVariables;
Utils::expandMacros(&res, d); Utils::expandMacros(&res, d);
--d->m_lockDepth;
return res; return res;
} }