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

Fixed bug in ObjC class field parsing which could result in an invalid pointer in the AST.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-01-22 09:44:40 +01:00
parent 800f4babc6
commit 007d76aada
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/cplusplus/Parser.cpp
View File

@@ -5142,8 +5142,6 @@ bool Parser::parseObjCPropertyDeclaration(DeclarationAST *&node, SpecifierListAS
if (!parseObjCPropertyAttribute(last->value)) {
_translationUnit->error(_tokenIndex, "expected token `%s' got `%s'",
Token::name(T_IDENTIFIER), tok().spell());
while (LA() != T_RPAREN)
consumeToken();
break;
}
}
@@ -5152,9 +5150,11 @@ bool Parser::parseObjCPropertyDeclaration(DeclarationAST *&node, SpecifierListAS
match(T_RPAREN, &(ast->rparen_token));
}
parseSimpleDeclaration(ast->simple_declaration, /*accept-struct-declarators = */ true);
if (parseSimpleDeclaration(ast->simple_declaration, /*accept-struct-declarators = */ true))
node = ast;
else
_translationUnit->error(_tokenIndex, "expected a simple declaration");
node = ast;
return true;
}