summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/UnwrappedLineParser.cpp
diff options
context:
space:
mode:
authorManuel Klimek <klimek@google.com>2013-01-11 18:28:36 +0000
committerManuel Klimek <klimek@google.com>2013-01-11 18:28:36 +0000
commitadededff2657833d4ee7cdaeeb5afe6707adbdb1 (patch)
tree6e19fdfa51b3cd111dfbadb3eebb87fadb3e0bb4 /clang/lib/Format/UnwrappedLineParser.cpp
parentd5e5f8f2a47246275a34c01c3eb472267eb40f92 (diff)
downloadbcm5719-llvm-adededff2657833d4ee7cdaeeb5afe6707adbdb1.tar.gz
bcm5719-llvm-adededff2657833d4ee7cdaeeb5afe6707adbdb1.zip
Fix crash on invalid.
if { foo; } would previously crash clang-format. llvm-svn: 172232
Diffstat (limited to 'clang/lib/Format/UnwrappedLineParser.cpp')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 758f8193ca4..07ad7a7489e 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -404,7 +404,8 @@ void UnwrappedLineParser::parseParens() {
void UnwrappedLineParser::parseIfThenElse() {
assert(FormatTok.Tok.is(tok::kw_if) && "'if' expected");
nextToken();
- parseParens();
+ if (FormatTok.Tok.is(tok::l_paren))
+ parseParens();
bool NeedsUnwrappedLine = false;
if (FormatTok.Tok.is(tok::l_brace)) {
parseBlock();
OpenPOWER on IntegriCloud