Author: Kadir Cetinkaya Date: 2022-10-05T09:55:50+02:00 New Revision: 36a200208facf58d454c9b7253c956c2f2a8b946
URL: https://github.com/llvm/llvm-project/commit/36a200208facf58d454c9b7253c956c2f2a8b946 DIFF: https://github.com/llvm/llvm-project/commit/36a200208facf58d454c9b7253c956c2f2a8b946.diff LOG: [clang][Lex] Fix a crash on malformed string literals Differential Revision: https://reviews.llvm.org/D135161 Added: Modified: clang/lib/Lex/LiteralSupport.cpp clang/test/Lexer/char-escapes-delimited.c clang/unittests/Lex/LexerTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Lex/LiteralSupport.cpp b/clang/lib/Lex/LiteralSupport.cpp index 1a48a68c28b62..160240e49dd70 100644 --- a/clang/lib/Lex/LiteralSupport.cpp +++ b/clang/lib/Lex/LiteralSupport.cpp @@ -545,7 +545,6 @@ static bool ProcessNamedUCNEscape(const char *ThisTokBegin, diag::err_delimited_escape_missing_brace) << StringRef(&ThisTokBuf[-1], 1); } - ThisTokBuf++; return false; } ThisTokBuf++; diff --git a/clang/test/Lexer/char-escapes-delimited.c b/clang/test/Lexer/char-escapes-delimited.c index 65e3dc740e3b4..43ade65a58309 100644 --- a/clang/test/Lexer/char-escapes-delimited.c +++ b/clang/test/Lexer/char-escapes-delimited.c @@ -94,7 +94,7 @@ void named(void) { unsigned h = U'\N{LOTUS}'; // ext-warning {{extension}} cxx2b-warning {{C++2b}} unsigned i = u'\N{GREEK CAPITAL LETTER DELTA}'; // ext-warning {{extension}} cxx2b-warning {{C++2b}} - char j = '\NN'; // expected-error {{expected '{' after '\N' escape sequence}} + char j = '\NN'; // expected-error {{expected '{' after '\N' escape sequence}} expected-warning {{multi-character character constant}} unsigned k = u'\N{LOTUS'; // expected-error {{incomplete universal character name}} } diff --git a/clang/unittests/Lex/LexerTest.cpp b/clang/unittests/Lex/LexerTest.cpp index 0ad644ce71465..aefe5f1ab35a3 100644 --- a/clang/unittests/Lex/LexerTest.cpp +++ b/clang/unittests/Lex/LexerTest.cpp @@ -18,6 +18,7 @@ #include "clang/Basic/TokenKinds.h" #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/HeaderSearchOptions.h" +#include "clang/Lex/LiteralSupport.h" #include "clang/Lex/MacroArgs.h" #include "clang/Lex/MacroInfo.h" #include "clang/Lex/ModuleLoader.h" @@ -659,4 +660,11 @@ TEST_F(LexerTest, RawAndNormalLexSameForLineComments) { } EXPECT_TRUE(ToksView.empty()); } + +TEST_F(LexerTest, BrokenStringLiteral) { + const llvm::StringLiteral Source = R"cpp("\N")cpp"; + // Make sure this isn't crashing. + StringLiteralParser P(Lex(Source), *PP); + EXPECT_TRUE(P.hadError); +} } // anonymous namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
