maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Prevent assertion discovered by fuzzer. 

llvm-svn: 236578
This commit is contained in:
Daniel Jasper 2015-05-06 08:58:57 +00:00
parent 4d9ec17f1e
commit 62c78f5474
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Format/TokenAnnotator.cpp
View File

@ -895,8 +895,16 @@ private:
(!Current.Previous || Current.Previous->isNot(tok::l_square))) { (!Current.Previous || Current.Previous->isNot(tok::l_square))) {
Current.Type = TT_BinaryOperator; Current.Type = TT_BinaryOperator;
} else if (Current.is(tok::comment)) { } else if (Current.is(tok::comment)) {
Current.Type = if (Current.TokenText.startswith("/*")) {
Current.TokenText.startswith("/*") ? TT_BlockComment : TT_LineComment; if (Current.TokenText.endswith("*/"))
Current.Type = TT_BlockComment;
else
// The lexer has for some reason determined a comment here. But we
// cannot really handle it, if it isn't properly terminated.
Current.Tok.setKind(tok::unknown);
} else {
Current.Type = TT_LineComment;
}
} else if (Current.is(tok::r_paren)) { } else if (Current.is(tok::r_paren)) {
if (rParenEndsCast(Current)) if (rParenEndsCast(Current))
Current.Type = TT_CastRParen; Current.Type = TT_CastRParen;

2
clang/unittests/Format/FormatTest.cpp
View File

@ -1056,6 +1056,8 @@ TEST_F(FormatTest, UnderstandsSingleLineComments) {
verifyNoCrash("/\\\n/"); verifyNoCrash("/\\\n/");
verifyNoCrash("/\\\n* */"); verifyNoCrash("/\\\n* */");
// The 0-character somehow makes the lexer return a proper comment.
verifyNoCrash(StringRef("/*\\\0\n/", 6));
} }
TEST_F(FormatTest, KeepsParameterWithTrailingCommentsOnTheirOwnLine) { TEST_F(FormatTest, KeepsParameterWithTrailingCommentsOnTheirOwnLine) {