diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-06-18 11:23:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-06-24 11:49:23 +0000 |
| commit | 517cb44bb0e93720b41a8a62301251e79d39317c (patch) | |
| tree | 75f71c1c8a604eec83bf6c0bc18cd6c8b1ad4692 /src/shared | |
| parent | 6dde7767ce0e117d1281a7c7922b282793ba5871 (diff) | |
| download | qt-creator-517cb44bb0e93720b41a8a62301251e79d39317c.tar.gz | |
qmake: Let evaluateFunction() return error for infinite recursion
Otherwise, it can happen that parsing goes on forever in cumulative
mode.
Task-number: QTCREATORBUG-17656
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry-picked from qtbase/feb06decfe5355a14c982f7ddb427a262ad2b393)
Change-Id: If69f2265ac7eee0d230bd77a9aa9500e97ebeff6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 01233fc46f..6e75847eb9 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1702,7 +1702,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFunction( if (m_valuemapStack.count() >= 100) { evalError(fL1S("Ran into infinite recursion (depth > 100).")); - vr = ReturnFalse; + vr = ReturnError; } else { m_valuemapStack.push(ProValueMap()); m_locationStack.push(m_current); |