diff options
author | Aaron Ballman <aaron@aaronballman.com> | 2022-05-12 13:19:26 -0400 |
---|---|---|
committer | Aaron Ballman <aaron@aaronballman.com> | 2022-05-12 13:20:35 -0400 |
commit | c671041720347c9deb35b1165ee6b6bb88abf07a (patch) | |
tree | b4f3c879564c6ac67b8edbf654b8da63fc3ac77a /clang/lib/Parse/ParseDecl.cpp | |
parent | 6089fd6c0b1cca4fd16583b25954c132a9b58ebd (diff) | |
download | llvm-c671041720347c9deb35b1165ee6b6bb88abf07a.zip llvm-c671041720347c9deb35b1165ee6b6bb88abf07a.tar.gz llvm-c671041720347c9deb35b1165ee6b6bb88abf07a.tar.bz2 |
Check for resource exhaustion when recursively parsing declarators
With sufficiently tortured code, it's possible to cause a stack
overflow when parsing declarators. Thus, we now check for resource
exhaustion when recursively parsing declarators so that we can at least
warn the user we're about to crash before we actually crash.
Fixes #51642
Differential Revision: https://reviews.llvm.org/D124915
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
-rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 89e13cf..306644f 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -5765,11 +5765,12 @@ void Parser::ParseTypeQualifierListOpt( } /// ParseDeclarator - Parse and verify a newly-initialized declarator. -/// void Parser::ParseDeclarator(Declarator &D) { /// This implements the 'declarator' production in the C grammar, then checks /// for well-formedness and issues diagnostics. - ParseDeclaratorInternal(D, &Parser::ParseDirectDeclarator); + Actions.runWithSufficientStackSpace(D.getBeginLoc(), [&] { + ParseDeclaratorInternal(D, &Parser::ParseDirectDeclarator); + }); } static bool isPtrOperatorToken(tok::TokenKind Kind, const LangOptions &Lang, @@ -5880,7 +5881,9 @@ void Parser::ParseDeclaratorInternal(Declarator &D, D.ExtendWithDeclSpec(DS); // Recurse to parse whatever is left. - ParseDeclaratorInternal(D, DirectDeclParser); + Actions.runWithSufficientStackSpace(D.getBeginLoc(), [&] { + ParseDeclaratorInternal(D, DirectDeclParser); + }); // Sema will have to catch (syntactically invalid) pointers into global // scope. It has to catch pointers into namespace scope anyway. @@ -5929,7 +5932,8 @@ void Parser::ParseDeclaratorInternal(Declarator &D, D.ExtendWithDeclSpec(DS); // Recursively parse the declarator. - ParseDeclaratorInternal(D, DirectDeclParser); + Actions.runWithSufficientStackSpace( + D.getBeginLoc(), [&] { ParseDeclaratorInternal(D, DirectDeclParser); }); if (Kind == tok::star) // Remember that we parsed a pointer type, and remember the type-quals. D.AddTypeInfo(DeclaratorChunk::getPointer( @@ -5974,7 +5978,8 @@ void Parser::ParseDeclaratorInternal(Declarator &D, } // Recursively parse the declarator. - ParseDeclaratorInternal(D, DirectDeclParser); + Actions.runWithSufficientStackSpace( + D.getBeginLoc(), [&] { ParseDeclaratorInternal(D, DirectDeclParser); }); if (D.getNumTypeObjects() > 0) { // C++ [dcl.ref]p4: There shall be no references to references. |