commit d97d5d5cf75133ac8872a49f7615e357ab1e13da
author Daniel Jasper <djasper@google.com> Tue Feb 17 09:58:03 2015 +0000
committer Daniel Jasper <djasper@google.com> Tue Feb 17 09:58:03 2015 +0000
tree 8c8c1ba752ab37583ebcc613ea6b08c8b09a5435
parent fa27b8861b8ae1b9c686d8a50a6eeac72b874afb

clang-format: Fix crasher.

llvm-svn: 229485

clang/lib/Format/ContinuationIndenter.cpp

diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index fa7c7f1..a02cb68 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -365,7 +365,7 @@
       const FormatToken *Next = Previous.MatchingParen->getNextNonComment();
       HasTrailingCall = Next && Next->isMemberAccess();
     }
-    if (HasTrailingCall &&
+    if (HasTrailingCall && State.Stack.size() > 1 &&
         State.Stack[State.Stack.size() - 2].CallContinuation == 0)
       State.Stack.back().LastSpace = State.Column;
   }

clang/unittests/Format/FormatTest.cpp

diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index 242d2ba..52761f1 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -5818,6 +5818,7 @@
 TEST_F(FormatTest, IncorrectCodeUnbalancedBraces) {
   verifyFormat("{");
   verifyFormat("#})");
+  verifyNoCrash("(/**/[:!] ?[).");
 }
 
 TEST_F(FormatTest, IncorrectCodeDoNoWhile) {