Skip to content

[Clang] Fixed a crash when parsing #embed parameters with unmatched closing brackets #152877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2025
Merged

[Clang] Fixed a crash when parsing #embed parameters with unmatched closing brackets #152877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clang/docs/ReleaseNotes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ Crash and bug fixes
^^^^^^^^^^^^^^^^^^^
- Fixed a crash in the static analyzer that when the expression in an
``[[assume(expr)]]`` attribute was enclosed in parentheses. (#GH151529)
- Fixed a crash when parsing ``#embed`` parameters with unmatched closing brackets. (#GH152829)

Improvements
^^^^^^^^^^^^
Expand Down
6 changes: 5 additions & 1 deletion clang/lib/Lex/PPDirectives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3793,9 +3793,13 @@ Preprocessor::LexEmbedParameters(Token &CurTok, bool ForHasEmbed) {
[[fallthrough]];
case tok::r_brace:
case tok::r_square: {
if (BracketStack.empty()) {
ExpectOrDiagAndSkipToEOD(tok::r_paren);
return false;
}
tok::TokenKind Matching =
GetMatchingCloseBracket(BracketStack.back().first);
if (BracketStack.empty() || CurTok.getKind() != Matching) {
if (CurTok.getKind() != Matching) {
DiagMismatchedBracesAndSkipToEOD(Matching, BracketStack.back());
return false;
}
Expand Down
9 changes: 9 additions & 0 deletions clang/test/Preprocessor/embed_parsing_errors.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ char buffer[] = {
#embed "embed_parsing_errors.c" prefix() // OK: tokens within parens are optional
#embed "embed_parsing_errors.c" prefix)
// expected-error@-1 {{expected '('}}
#embed "embed_parsing_errors.c" prefix()) // expected-error {{expected identifier}}
#embed "embed_parsing_errors.c" prefix(]) // expected-error {{expected ')'}}
#embed "embed_parsing_errors.c" prefix(}) // expected-error {{expected ')'}}

#embed "embed_parsing_errors.c" suffix
// expected-error@-1 {{expected '('}}
Expand All @@ -115,6 +118,9 @@ char buffer[] = {
#embed "embed_parsing_errors.c" suffix() // OK: tokens within parens are optional
#embed "embed_parsing_errors.c" suffix)
// expected-error@-1 {{expected '('}}
#embed "embed_parsing_errors.c" suffix()) // expected-error {{expected identifier}}
#embed "embed_parsing_errors.c" suffix(]) // expected-error {{expected ')'}}
#embed "embed_parsing_errors.c" suffix(}) // expected-error {{expected ')'}}

#embed "embed_parsing_errors.c" if_empty(1/0) // OK: emitted as tokens, not evaluated yet.
#embed "embed_parsing_errors.c" if_empty(([{}])) // OK: delimiters balanced
Expand All @@ -128,3 +134,6 @@ char buffer[] = {
#embed "embed_parsing_errors.c" if_empty)
// expected-error@-1 {{expected '('}}
};
#embed "embed_parsing_errors.c" if_empty()) // expected-error {{expected identifier}}
#embed "embed_parsing_errors.c" if_empty(]) // expected-error {{expected ')'}}
#embed "embed_parsing_errors.c" if_empty(}) // expected-error {{expected ')'}}