In demangle, ensure result is valid to avoid hanging. Use this util f…

…or stacktrace logging.
PDAL · Oct 12, 2016 · 71b3696 · 71b3696
1 parent 457f5ac
commit 71b3696
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/apps/pdal.cpp b/apps/pdal.cpp
@@ -50,7 +50,6 @@
 #include <execinfo.h>
 #include <unistd.h>
 #include <dlfcn.h>
-#include <cxxabi.h>
 #endif
 
 using namespace pdal;
@@ -241,8 +240,7 @@ int main(int argc, char* argv[])
 
             if (dladdr(buffer[i], &info))
             {
-                char* demangled = abi::__cxa_demangle(info.dli_sname, nullptr,
-                        0, &status);
+                const std::string demangled(Utils::demangle(info.dli_sname));
 
                 const std::size_t offset(
                         static_cast<char*>(buffer[i]) -
@@ -257,11 +255,8 @@ int main(int argc, char* argv[])
                     prefix = symbol.substr(0, pos);
                 }
 
-                lines.push_back(prefix +
-                        (status == 0 ? demangled : info.dli_sname) + " + " +
+                lines.push_back(prefix + demangled + " + " +
                         std::to_string(offset));
-
-                free(demangled);
             }
             else
             {

diff --git a/src/util/Utils.cpp b/src/util/Utils.cpp
@@ -537,10 +537,11 @@ std::string Utils::demangle(const std::string& s)
     int status;
     std::unique_ptr<char[], void (*)(void*)> result(
             abi::__cxa_demangle(s.c_str(), 0, 0, &status), std::free);
-    return std::string(result.get());
-#else
-    return s;
+    if (status == 0)
+        return std::string(result.get());
 #endif
+
+    return s;
 }