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

CppEditor: Fix crash with invalid switch/case statement

Browse Source 
Task-number: QTCREATORBUG-14925
Change-Id: Iea2cf17070d9db48924e76f6c7febca0d52e4686
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2015-08-18 10:46:57 +02:00
parent bf6e9f0550
commit 45778539d8
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -514,6 +514,21 @@ void CppEditorPlugin::test_quickfix_data()
"}\n" "}\n"
); );
// Checks: Do not crash on incomplete case statetement.
QTest::newRow("CompleteSwitchCaseStatement_doNotCrashOnIncompleteCase")
<< CppQuickFixFactoryPtr(new CompleteSwitchCaseStatement) << _(
"enum E {};\n"
"void f(E o)\n"
"{\n"
" @switch (o)\n"
" {\n"
" case\n"
" }\n"
"}\n"
) << _(
""
);
// Checks: // Checks:
// 1. If the name does not start with ("m_" or "_") and does not // 1. If the name does not start with ("m_" or "_") and does not
// end with "_", we are forced to prefix the getter with "get". // end with "_", we are forced to prefix the getter with "get".

12
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -2212,11 +2212,13 @@ public:
bool preVisit(AST *ast) { bool preVisit(AST *ast) {
if (CaseStatementAST *cs = ast->asCaseStatement()) { if (CaseStatementAST *cs = ast->asCaseStatement()) {
foundCaseStatementLevel = true; foundCaseStatementLevel = true;
if (ExpressionAST *expression = cs->expression->asIdExpression()) { if (ExpressionAST *csExpression = cs->expression) {
QList<LookupItem> candidates = typeOfExpression(expression, document, scope); if (ExpressionAST *expression = csExpression->asIdExpression()) {
if (!candidates .isEmpty() && candidates.first().declaration()) { QList<LookupItem> candidates = typeOfExpression(expression, document, scope);
Symbol *decl = candidates.first().declaration(); if (!candidates .isEmpty() && candidates.first().declaration()) {
values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl)); Symbol *decl = candidates.first().declaration();
values << prettyPrint.prettyName(LookupContext::fullyQualifiedName(decl));
}
} }
} }
return true; return true;