From fea798011b25dea69c9ea7cc75c13170b99b0e9a Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@kernel.org>
Date: Tue, 15 Sep 2015 18:27:52 -0700
Subject: Switch show_stackframe to backtrace_symbols_fd

It's simpler and avoids calling into fprintf in contexts in which
it might crash or deadlock.
---
 src/common.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/common.cpp b/src/common.cpp
index 2d844129..aa5b77c8 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -90,17 +90,8 @@ void show_stackframe()
     int trace_size = 0;
 
     trace_size = backtrace(trace, 32);
-    char **messages = backtrace_symbols(trace, trace_size);
-
-    if (messages)
-    {
-        debug(0, L"Backtrace:");
-        for (int i=0; i<trace_size; i++)
-        {
-            fwprintf(stderr, L"%s\n", messages[i]);
-        }
-        free(messages);
-    }
+    debug(0, L"Backtrace:");
+    backtrace_symbols_fd(trace, trace_size, STDERR_FILENO);
 }
 
 int fgetws2(wcstring *s, FILE *f)
-- 
cgit v1.2.3