[clang-format] fix crash involving invalid preprocessor line
authorKrasimir Georgiev <krasimir@google.com>
Thu, 8 Aug 2019 11:56:18 +0000 (11:56 +0000)
committerKrasimir Georgiev <krasimir@google.com>
Thu, 8 Aug 2019 11:56:18 +0000 (11:56 +0000)
commit9ab051bdda8de83df9abbaf00e76500875c3669e
tree93d08a71ab6f1f19c4162dd93110406ca0170633
parent0de33de81338304492526053d0c1cfa616e58992
[clang-format] fix crash involving invalid preprocessor line

Summary:
This (invalid) fragment is crashing clang-format:
```
#if 1
int x;
#elif
int y;
#endif
```

The reason being that the parser expects a token after `#elif`, and the
subsequent parsing of the next line does not check if `CurrentToken` is null.

Reviewers: gribozavr

Reviewed By: gribozavr

Subscribers: cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D65940

llvm-svn: 368280
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp