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

preprocessor: do not loop endlessly on incomplete expressions

Browse Source 
An missing closing parantheses after "defined(..." caused an endless loop.

Change-Id: I19b17cebc1a56880216c3bfb67c9d296f80cc064
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
hjk
2012-05-29 14:33:56 +02:00
committed by hjk
parent 9ac204bdfb
commit 6d04f3ce25
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/cplusplus/pp-engine.cpp
View File

@@ -654,12 +654,12 @@ void Preprocessor::handleDefined(PPToken *tk)
break; break;
} while (isValidToken(*tk)); } while (isValidToken(*tk));
if (lparenSeen) {
while (tk->isNot(T_RPAREN)) if (lparenSeen && tk->is(T_RPAREN))
lex(tk); lex(tk);
} else {
pushToken(tk); pushToken(tk);
}
QByteArray result(1, '0'); QByteArray result(1, '0');
if (m_env->resolve(idToken.asByteArrayRef())) if (m_env->resolve(idToken.asByteArrayRef()))
result[0] = '1'; result[0] = '1';

20
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
View File

@@ -886,6 +886,26 @@ void tst_Preprocessor::defined_data()
"#if X <= 0x040000\n" "#if X <= 0x040000\n"
"#define Y 1\n" "#define Y 1\n"
"#endif\n"; "#endif\n";
QTest::newRow("incomplete defined 1") << true << true <<
"#define X 0x040500\n"
"#if defined(X\n"
"#define Y 1\n"
"#endif\n";
QTest::newRow("incomplete defined 2") << false << false <<
"#if defined(X\n"
"#define Y 1\n"
"#endif\n";
QTest::newRow("complete defined 1") << true << true <<
"#define X 0x040500\n"
"#if defined(X )\n"
"#define Y 1\n"
"#endif\n";
QTest::newRow("complete defined 2") << true << true <<
"#define X 0x040500\n"
"#if defined(X/*xxx*/)\n"
"#define Y 1\n"
"#endif\n";
} }
QTEST_APPLESS_MAIN(tst_Preprocessor) QTEST_APPLESS_MAIN(tst_Preprocessor)