maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Parse: Don't crash when an annotation token shows up in a C++11 attr 

It's not safe to blindly call getIdentifierInfo without checking the
token is not an annotation token.

llvm-svn: 225533
This commit is contained in:
David Majnemer 2015-01-09 18:09:39 +00:00
parent 2bcfc6f95e
commit d527199c37
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Parse/ParseDeclCXX.cpp
View File

@ -3386,9 +3386,11 @@ IdentifierInfo *Parser::TryParseCXX11AttributeIdentifier(SourceLocation &Loc) {
switch (Tok.getKind()) { switch (Tok.getKind()) {
default: default:
// Identifiers and keywords have identifier info attached. // Identifiers and keywords have identifier info attached.
if (IdentifierInfo *II = Tok.getIdentifierInfo()) { if (!Tok.isAnnotation()) {
Loc = ConsumeToken(); if (IdentifierInfo *II = Tok.getIdentifierInfo()) {
return II; Loc = ConsumeToken();
return II;
}
} }
return nullptr; return nullptr;

7
clang/test/Parser/cxx0x-attributes.cpp
View File

@ -334,3 +334,10 @@ namespace {
[[deprecated()]] void foo(); // expected-error {{parentheses must be omitted if 'deprecated' attribute's argument list is empty}} [[deprecated()]] void foo(); // expected-error {{parentheses must be omitted if 'deprecated' attribute's argument list is empty}}
[[gnu::deprecated()]] void quux(); [[gnu::deprecated()]] void quux();
} }
namespace {
[[ // expected-error {{expected ']'}}
#pragma pack(pop)
deprecated
]] void bad();
}