From b0b31af7de1a270c075e57d013047d80a5dd208d Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sun, 17 Jan 2016 02:48:23 +0000 Subject: [PATCH] refs #572 getStackTrace: Fixed segfault on Linux caused by trying to use a QStringBuilder after the temporaries it referred to had been destroyed. --- src/blackmisc/stacktrace.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/stacktrace.cpp b/src/blackmisc/stacktrace.cpp index 6acba9a5f..658bb84f2 100644 --- a/src/blackmisc/stacktrace.cpp +++ b/src/blackmisc/stacktrace.cpp @@ -92,10 +92,16 @@ namespace BlackMisc demangled = abi::__cxa_demangle(QByteArray(symbol, symbolEnd - symbol).constData(), demangled, &size, nullptr); - auto details = '(' % QLatin1String(basename, basenameEnd - basename) % ' ' % QLatin1String(symbol, end - symbol) % ')'; - result.push_back(demangled ? QLatin1String(demangled) % ' ' % details : QString(details)); - - if (! demangled) { demangled = temp; } + if (demangled) + { + result.push_back(QLatin1String(demangled) % ' ' % + '(' % QLatin1String(basename, basenameEnd - basename) % ' ' % QLatin1String(symbol, end - symbol) % ')'); + } + else + { + result.push_back('(' % QLatin1String(basename, basenameEnd - basename) % ' ' % QLatin1String(symbol, end - symbol) % ')'); + demangled = temp; + } } free(symbols); free(demangled);