This is an archive of the discontinued LLVM Phabricator instance.

[clang-format] Fix crash in getLengthToMatchingParen
ClosedPublic

Authored by krasimir on May 22 2018, 2:48 AM.

Reviewers

Commits

Summary

Repository

rC Clang

Build Status

Buildable 18444
Build 18444: arc lint + arc unit

This revision was not accepted when it landed; it landed in state Needs Review.May 22 2018, 2:50 AM

This revision was automatically updated to reflect the committed changes.

No test?

Added a test in rL332974.
Didn't add a test case and didn't wait for review. Sorry about that!

Path

Size

lib/

Format/

6 lines

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines	while (MatchingStackIndex >= 0 && Stack[MatchingStackIndex].Tok != LBrace)
--MatchingStackIndex;		--MatchingStackIndex;
return MatchingStackIndex >= 0 ? &Stack[MatchingStackIndex] : nullptr;		return MatchingStackIndex >= 0 ? &Stack[MatchingStackIndex] : nullptr;
};		};
for (; End->Next; End = End->Next) {		for (; End->Next; End = End->Next) {
if (End->Next->CanBreakBefore)		if (End->Next->CanBreakBefore)
break;		break;
if (!End->Next->closesScope())		if (!End->Next->closesScope())
continue;		continue;
if (End->Next->MatchingParen->isOneOf(tok::l_brace,		if (End->Next->MatchingParen &&
TT_ArrayInitializerLSquare,		End->Next->MatchingParen->isOneOf(
tok::less)) {		tok::l_brace, TT_ArrayInitializerLSquare, tok::less)) {
const ParenState *State = FindParenState(End->Next->MatchingParen);		const ParenState *State = FindParenState(End->Next->MatchingParen);
if (State && State->BreakBeforeClosingBrace)		if (State && State->BreakBeforeClosingBrace)
break;		break;
}		}
}		}
return End->TotalLength - Tok.TotalLength + 1;		return End->TotalLength - Tok.TotalLength + 1;
}		}

▲ Show 20 Lines • Show All 2,023 Lines • Show Last 20 Lines