From 75a943ef57da0179e742c7d396fb28f909e1add1 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 3 Feb 2015 09:10:37 +0200 Subject: C++: Fix crash when #if[def] nesting is deeper than 512 levels Change-Id: I5e86da3a36514545834f554470b147ad8be43344 Reviewed-by: Eike Ziller Reviewed-by: Nikolai Kosjar --- src/libs/cplusplus/pp-engine.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'src/libs/cplusplus/pp-engine.cpp') diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index c0e6e3e827..9cafea26f2 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -140,6 +140,12 @@ static bool isQtReservedWord(const char *name, int size) return false; } +static void nestingTooDeep() +{ +#ifndef NO_DEBUG + std::cerr << "*** WARNING #if / #ifdef nesting exceeded the max level " << MAX_LEVEL << std::endl; +#endif +} } // anonymous namespace @@ -1819,6 +1825,12 @@ void Preprocessor::handleIfDirective(PPToken *tk) lex(tk); // consume "if" token Value result; const PPToken lastExpressionToken = evalExpression(tk, result); + + if (m_state.m_ifLevel >= MAX_LEVEL - 1) { + nestingTooDeep(); + return; + } + const bool value = !result.is_zero(); const bool wasSkipping = m_state.m_skipping[m_state.m_ifLevel]; @@ -1945,12 +1957,17 @@ void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk) value = !value; const bool wasSkipping = m_state.m_skipping[m_state.m_ifLevel]; - ++m_state.m_ifLevel; - m_state.m_trueTest[m_state.m_ifLevel] = value; - m_state.m_skipping[m_state.m_ifLevel] = wasSkipping ? wasSkipping : !value; - if (m_client && !wasSkipping && !value) - startSkippingBlocks(*tk); + if (m_state.m_ifLevel < MAX_LEVEL - 1) { + ++m_state.m_ifLevel; + m_state.m_trueTest[m_state.m_ifLevel] = value; + m_state.m_skipping[m_state.m_ifLevel] = wasSkipping ? wasSkipping : !value; + + if (m_client && !wasSkipping && !value) + startSkippingBlocks(*tk); + } else { + nestingTooDeep(); + } lex(tk); // consume the identifier #ifndef NO_DEBUG -- cgit v1.2.1