From 2d02ae0f0c1bb5dba14761e3c827d11e29c2421d Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Thu, 13 Jun 2019 10:18:40 -0700 Subject: [PATCH] cobra_to_sentry / backtraces are reversed and line number is not extracted correctly --- CHANGELOG.md | 1 + DOCKER_VERSION | 2 +- ws/IXSentryClient.cpp | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e848e5b8..1d96271f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. ## [unreleased] - 2019-06-09 ### Changed +- cobra_to_sentry / backtraces are reversed and line number is not extracted correctly - mbedtls and zlib are searched with find_package, and we use the vendored version if nothing is found - travis CI uses g++ on Linux diff --git a/DOCKER_VERSION b/DOCKER_VERSION index fcdb2e10..c5106e6d 100644 --- a/DOCKER_VERSION +++ b/DOCKER_VERSION @@ -1 +1 @@ -4.0.0 +4.0.4 diff --git a/ws/IXSentryClient.cpp b/ws/IXSentryClient.cpp index f6462a89..3cc3714f 100644 --- a/ws/IXSentryClient.cpp +++ b/ws/IXSentryClient.cpp @@ -72,7 +72,6 @@ namespace ix std::string line; std::stringstream tokenStream(stack); - std::stringstream ss; std::smatch group; while (std::getline(tokenStream, line)) @@ -84,6 +83,7 @@ namespace ix const auto linenoStr = group.str(2); const auto function = group.str(3); + std::stringstream ss; ss << linenoStr; uint64_t lineno; ss >> lineno; @@ -97,6 +97,8 @@ namespace ix } } + std::reverse(frames.begin(), frames.end()); + return frames; }