From 62c78f547471aaccf639f6ec32bf3e633bc4effd Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 6 May 2015 08:58:57 +0000 Subject: clang-format: Prevent assertion discovered by fuzzer. llvm-svn: 236578 --- clang/lib/Format/TokenAnnotator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'clang/lib/Format/TokenAnnotator.cpp') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 39ac66b27fa..fa12d4dd7ab 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -895,8 +895,16 @@ private: (!Current.Previous || Current.Previous->isNot(tok::l_square))) { Current.Type = TT_BinaryOperator; } else if (Current.is(tok::comment)) { - Current.Type = - Current.TokenText.startswith("/*") ? TT_BlockComment : TT_LineComment; + if (Current.TokenText.startswith("/*")) { + 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)) { if (rParenEndsCast(Current)) Current.Type = TT_CastRParen; -- cgit v1.2.3