commit 9b79efb51f9ec9d6847a7373092c5006da2eeae1
author Daniel Jasper <djasper@google.com> Mon Jan 19 11:49:32 2015 +0000
committer Daniel Jasper <djasper@google.com> Mon Jan 19 11:49:32 2015 +0000
tree 2a576569838f7df817dd0f64a316b22f327eb9a8
parent 6c6e589c1f09e519aaca5d7161801dd7d6fd8960

clang-format: Fix crasher on weird comments.

Crashing input:
  /\
  / comment

llvm-svn: 226454

clang/lib/Format/TokenAnnotator.cpp

diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 58902bf..df6bfd3 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -838,10 +838,8 @@
                (!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;

clang/unittests/Format/FormatTest.cpp

diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index f267c94..615b46a 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -1035,6 +1035,9 @@
                    "     // spanning two lines\n"
                    " x + 3) {\n"
                    "}"));
+
+  verifyNoCrash("/\\\n/");
+  verifyNoCrash("/\\\n* */");
 }
 
 TEST_F(FormatTest, KeepsParameterWithTrailingCommentsOnTheirOwnLine) {