diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-03-16 22:30:13 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-03-16 22:30:13 +0000 |
| commit | dc970f086663cf5ade0ccac79f8cb58e4bf110d5 (patch) | |
| tree | c68a90dbc91ba7b70e8c81204e5293e6554a8178 /clang/lib/Parse/ParseDeclCXX.cpp | |
| parent | a41f71212a677f56c908c178ca679e17875c0052 (diff) | |
| download | bcm5719-llvm-dc970f086663cf5ade0ccac79f8cb58e4bf110d5.tar.gz bcm5719-llvm-dc970f086663cf5ade0ccac79f8cb58e4bf110d5.zip | |
Audit all Preprocessor::getSpelling() callers, improving failure
recovery for those that need it.
llvm-svn: 98689
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index b92e7539ded..11f84edcf18 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -167,7 +167,10 @@ Parser::DeclPtrTy Parser::ParseLinkage(ParsingDeclSpec &DS, assert(Tok.is(tok::string_literal) && "Not a string literal!"); llvm::SmallString<8> LangBuffer; // LangBuffer is guaranteed to be big enough. - llvm::StringRef Lang = PP.getSpelling(Tok, LangBuffer); + bool Invalid = false; + llvm::StringRef Lang = PP.getSpelling(Tok, LangBuffer, &Invalid); + if (Invalid) + return DeclPtrTy(); SourceLocation Loc = ConsumeStringToken(); |
