wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug discovered by valgrind. 

When trying to merge lines, we should not touch lines that are invalid,
as we don't know how long they might be.

llvm-svn: 173043
This commit is contained in:
Daniel Jasper 2013-01-21 14:18:28 +00:00
parent d5e782b010
commit d41ee2d2af
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Format/Format.cpp
View File

@ -1716,7 +1716,7 @@ private:
return;
Limit -= I->Last->TotalLength + 1; // One space.
if (I + 1 == E)
if (I + 1 == E || (I + 1)->Type == LT_Invalid)
return;
if (I->Last->is(tok::l_brace)) {
@ -1770,7 +1770,8 @@ private:
std::vector<AnnotatedLine>::iterator E,
unsigned Limit){
// Check that we still have three lines and they fit into the limit.
if (I + 2 == E || !nextTwoLinesFitInto(I, Limit))
if (I + 2 == E || (I + 2)->Type == LT_Invalid ||
!nextTwoLinesFitInto(I, Limit))
return;
// First, check that the current line allows merging. This is the case if