Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-08 06:38:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preprocessor: Recover instead of mutating a token in ExpandBuiltinMacro

Browse Source 
We would CreateString on arbitrary garbage instead of just skipping to
the end of the builtin macro.  Eventually, this would cause us to crash
because we would end up replacing the contents of a character token with
a numeric literal.

This fixes PR21825.

llvm-svn: 224238
This commit is contained in:
David Majnemer 2014-12-15 09:03:58 +00:00
parent 418ad3ff10
commit d616362fe3
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -1415,6 +1415,10 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
if (IsScopeValid && Tok.is(tok::r_paren))
IsValid = true;
}
// Eat tokens until ')'.
while (Tok.isNot(tok::r_paren) && Tok.isNot(tok::eod) &&
Tok.isNot(tok::eof))
LexUnexpandedToken(Tok);
}
int Value = 0;
@ -1441,9 +1445,10 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
Value = HasFeature(*this, FeatureII);
}
if (!IsValid)
return;
OS << Value;
if (IsValid)
Tok.setKind(tok::numeric_constant);
Tok.setKind(tok::numeric_constant);
} else if (II == Ident__has_include ||
II == Ident__has_include_next) {
// The argument to these two builtins should be a parenthesized
@ -1507,9 +1512,10 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
WarningName.substr(2), Diags);
} while (false);
if (!IsValid)
return;
OS << (int)Value;
if (IsValid)
Tok.setKind(tok::numeric_constant);
Tok.setKind(tok::numeric_constant);
} else if (II == Ident__building_module) {
// The argument to this builtin should be an identifier. The
// builtin evaluates to 1 when that identifier names the module we are

9
clang/test/Preprocessor/feature_tests.c
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 %s -triple=i686-apple-darwin9
// RUN: %clang_cc1 %s -triple=i686-apple-darwin9 -verify -DVERIFY
// RUN: %clang_cc1 %s -E -triple=i686-apple-darwin9
#ifndef __has_feature
#error Should have __has_feature
@ -53,3 +53,10 @@
#if !HAS_BUILTIN(MY_ALIAS_BUILTIN) || !HAS_FEATURE(MY_ALIAS_FEATURE)
#error Expansion should have occurred
#endif
#ifdef VERIFY
// expected-error@+2 {{builtin feature check macro requires a parenthesized identifier}}
// expected-error@+1 {{expected value in expression}}
#if __has_feature('x')
#endif
#endif