diff options
| author | David Carlier <devnexen@gmail.com> | 2018-09-18 10:31:10 +0000 |
|---|---|---|
| committer | David Carlier <devnexen@gmail.com> | 2018-09-18 10:31:10 +0000 |
| commit | 38a20c2a524e8c6982357215d15903e72ebf5939 (patch) | |
| tree | bec22b10051d74547d7c5b13e0ed66a3d3c912e1 /llvm/tools/llvm-xray | |
| parent | 821a116818348b39236a6d57d32be56bb3b131a4 (diff) | |
| download | bcm5719-llvm-38a20c2a524e8c6982357215d15903e72ebf5939.tar.gz bcm5719-llvm-38a20c2a524e8c6982357215d15903e72ebf5939.zip | |
[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: 342461
Diffstat (limited to 'llvm/tools/llvm-xray')
| -rw-r--r-- | llvm/tools/llvm-xray/xray-account.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/tools/llvm-xray/xray-account.cpp b/llvm/tools/llvm-xray/xray-account.cpp index 2776a888848..77de1de496f 100644 --- a/llvm/tools/llvm-xray/xray-account.cpp +++ b/llvm/tools/llvm-xray/xray-account.cpp @@ -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)); |
