dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop when ::new or ::delete are found in member initializer list, by Denis Zobnin 

Fix for an infinite loop on parsing ::new or ::delete in member initializer list, found by fuzzing PR23057, comment #33. Skip the rest of the member initializers if the previous initializer was invalid.
Differential Revision: http://reviews.llvm.org/D16216


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@258290 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Bataev 2016-01-20 05:25:51 +00:00
parent 3d5d4c3965
commit 7506929a38
2 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Parse/ParseDeclCXX.cpp
View File

@ -3187,28 +3187,30 @@ void Parser::ParseConstructorInitializer(Decl *ConstructorDecl) {
Actions.CodeCompleteConstructorInitializer(ConstructorDecl,
MemInitializers);
return cutOffParsing();
} else {
MemInitResult MemInit = ParseMemInitializer(ConstructorDecl);
if (!MemInit.isInvalid())
MemInitializers.push_back(MemInit.get());
else
AnyErrors = true;
}
MemInitResult MemInit = ParseMemInitializer(ConstructorDecl);
if (!MemInit.isInvalid())
MemInitializers.push_back(MemInit.get());
else
AnyErrors = true;
if (Tok.is(tok::comma))
ConsumeToken();
else if (Tok.is(tok::l_brace))
break;
// If the next token looks like a base or member initializer, assume that
// we're just missing a comma.
else if (Tok.isOneOf(tok::identifier, tok::coloncolon)) {
// If the previous initializer was valid and the next token looks like a
// base or member initializer, assume that we're just missing a comma.
else if (!MemInit.isInvalid() &&
Tok.isOneOf(tok::identifier, tok::coloncolon)) {
SourceLocation Loc = PP.getLocForEndOfToken(PrevTokLocation);
Diag(Loc, diag::err_ctor_init_missing_comma)
<< FixItHint::CreateInsertion(Loc, ", ");
} else {
// Skip over garbage, until we get to '{'. Don't eat the '{'.
Diag(Tok.getLocation(), diag::err_expected_either) << tok::l_brace
<< tok::comma;
if (!MemInit.isInvalid())
Diag(Tok.getLocation(), diag::err_expected_either) << tok::l_brace
<< tok::comma;
SkipUntil(tok::l_brace, StopAtSemi | StopBeforeMatch);
break;
}

42
test/Parser/cxx-invalid-function-decl.cpp Normal file
View File

@ -0,0 +1,42 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
// Check that "::new" and "::delete" in member initializer list are diagnosed
// correctly and don't lead to infinite loop on parsing.
// Error: X() (initializer on non-constructor), "::new" is skipped.
void f1() : X() ::new{}; // expected-error{{only constructors take base initializers}}
// Errors: first "::delete" and initializer on non-constructor, others skipped.
void f2() : ::delete, ::new, X() ::new ::delete{} // expected-error{{expected class member or base class name}}
// expected-error@-1{{only constructors take base initializers}}
// Errors: the '::' token, "::delete" and initializer on non-constructor, others skipped.
void f3() : ::, ::delete X(), ::new {}; // expected-error2{{expected class member or base class name}}
// expected-error@-1{{only constructors take base initializers}}
template <class T>
struct Base1 {
T x1;
Base1(T a1) : x1(a1) {}
};
template <class T>
struct Base2 {
T x2;
Base2(T a2) : x2(a2) {}
};
struct S : public Base1<int>, public Base2<float> {
int x;
// 1-st initializer is correct (just missing ','), 2-nd incorrect, skip other.
S() : ::Base1<int>(0) ::new, ::Base2<float>(1.0) ::delete x(2) {} // expected-error{{expected class member or base class name}}
// expected-error@-1{{missing ',' between base or member initializers}}
// 1-st and 2-nd are correct, errors: '::' and "::new", others skipped.
S(int a) : Base1<int>(a), ::Base2<float>(1.0), ::, // expected-error{{expected class member or base class name}}
::new, ! ::delete, ::Base2<() x(3) {} // expected-error{{expected class member or base class name}}
// All initializers are correct, nothing to skip, diagnose 2 missing commas.
S(const S &) : Base1<int>(0) ::Base2<float>(1.0) x(2) {} // expected-error2{{missing ',' between base or member initializers}}
};