Commit dfebe573 authored Oct 22, 2018 by Tom Stellard

Merging r342461:

------------------------------------------------------------------------
r342461 | devnexen | 2018-09-18 03:31:10 -0700 (Tue, 18 Sep 2018) | 10 lines

[Xray] llvm-xray fix possible segfault

top argument when superior to the instrumentated code list capacity can lead to a segfault.

Reviewers: dberris

Reviewed By: dberris

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

------------------------------------------------------------------------

llvm-svn: 344918

parent 0447cd66

llvm/tools/llvm-xray/xray-account.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -358,8 +358,11 @@ void LatencyAccountant::exportStats(const XRayFileHeader &Header, F Fn) const {
		break;
		}

		if (AccountTop > 0)
		Results.erase(Results.begin() + AccountTop.getValue(), Results.end());
		if (AccountTop > 0) {
		auto MaxTop =
		std::min(AccountTop.getValue(), static_cast<int>(Results.size()));
		Results.erase(Results.begin() + MaxTop, Results.end());
		}

		for (const auto &R : Results)
		Fn(std::get<0>(R), std::get<1>(R), std::get<2>(R));