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

make infinite loop protection work even without an iterator variable

Browse Source 
... (which is the usual case).

Change-Id: I464b6b284f963df45c7340ed079d540b528136f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
(cherry picked from qtbase/bd19870b81cee218e67feee4d5c4a46143334365)
This commit is contained in:
Oswald Buddenhagen
2015-05-11 14:01:49 +02:00
parent 36a8d8dcc5
commit 56e97c1e8b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -799,8 +799,8 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProLoop(
forever { forever {
if (infinite) { if (infinite) {
if (!variable.isEmpty()) if (!variable.isEmpty())
m_valuemapStack.top()[variable] = ProStringList(ProString(QString::number(index++))); m_valuemapStack.top()[variable] = ProStringList(ProString(QString::number(index)));
if (index > 1000) { if (++index > 1000) {
evalError(fL1S("Ran into infinite loop (> 1000 iterations).")); evalError(fL1S("Ran into infinite loop (> 1000 iterations)."));
break; break;
} }