From 9b79efb51f9ec9d6847a7373092c5006da2eeae1 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Mon, 19 Jan 2015 11:49:32 +0000 Subject: clang-format: Fix crasher on weird comments. Crashing input: /\ / comment llvm-svn: 226454 --- clang/lib/Format/TokenAnnotator.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clang/lib/Format/TokenAnnotator.cpp') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 58902bfbd69..df6bfd37ae0 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -838,10 +838,8 @@ private: (!Current.Previous || Current.Previous->isNot(tok::l_square))) { Current.Type = TT_BinaryOperator; } else if (Current.is(tok::comment)) { - if (Current.TokenText.startswith("//")) - Current.Type = TT_LineComment; - else - Current.Type = TT_BlockComment; + Current.Type = + Current.TokenText.startswith("/*") ? TT_BlockComment : TT_LineComment; } else if (Current.is(tok::r_paren)) { if (rParenEndsCast(Current)) Current.Type = TT_CastRParen; -- cgit v1.2.3