From 5feb3b216ba2633440df54de6e4ed234d5ae2536 Mon Sep 17 00:00:00 2001
From: Itay Bookstein <itay.bookstein@nextsilicon.com>
Date: Thu, 3 Mar 2022 10:44:58 +0200
Subject: [PATCH 1/3] Remove unused vector field from cfile_streambuf

---
 backward.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backward.hpp b/backward.hpp
index 19d5ba31..2d94d6db 100644
--- a/backward.hpp
+++ b/backward.hpp
@@ -3918,7 +3918,6 @@ class cfile_streambuf : public std::streambuf {
 
 private:
   FILE *sink;
-  std::vector<char> buffer;
 };
 
 #ifdef BACKWARD_SYSTEM_LINUX

From 927e25cd96a40218e2e769761a227556b1f1fb1a Mon Sep 17 00:00:00 2001
From: Itay Bookstein <itay.bookstein@nextsilicon.com>
Date: Thu, 3 Mar 2022 10:54:47 +0200
Subject: [PATCH 2/3] Flush output streams from crash handlers

---
 backward.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backward.hpp b/backward.hpp
index 2d94d6db..838f0c73 100644
--- a/backward.hpp
+++ b/backward.hpp
@@ -4248,7 +4248,7 @@ class SignalHandling {
 
     Printer printer;
     printer.address = true;
-    printer.print(st, stderr);
+    fflush(printer.print(st, stderr));
 
 #if (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 700) || \
     (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200809L)
@@ -4448,7 +4448,7 @@ class SignalHandling {
     st.skip_n_firsts(skip_frames);
 
     printer.address = true;
-    printer.print(st, std::cerr);
+    printer.print(st, std::cerr) << std::flush;
   }
 };
 

From e48437cc70bb3b0bb7d63ec63848802f3948815d Mon Sep 17 00:00:00 2001
From: Itay Bookstein <itay.bookstein@nextsilicon.com>
Date: Thu, 3 Mar 2022 11:08:41 +0200
Subject: [PATCH 3/3] Allow customization of handler in Linux/Darwin
 SignalHandling

This allows for easier wrapping of the already-publicly-exposed
handler logic without duplicating the registration logic in the
client.
---
 backward.hpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/backward.hpp b/backward.hpp
index 838f0c73..491f6bb8 100644
--- a/backward.hpp
+++ b/backward.hpp
@@ -4161,16 +4161,15 @@ class SignalHandling {
                                 sizeof posix_signals / sizeof posix_signals[0]);
   }
 
-  SignalHandling(const std::vector<int> &posix_signals = make_default_signals())
-      : _loaded(false) {
+  static bool installHandler(const std::vector<int> &posix_signals,
+                             void (*handler)(int, siginfo_t *, void *),
+                             char *altstack, size_t altstack_size) {
     bool success = true;
 
-    const size_t stack_size = 1024 * 1024 * 8;
-    _stack_content.reset(static_cast<char *>(malloc(stack_size)));
-    if (_stack_content) {
+    if (altstack) {
       stack_t ss;
-      ss.ss_sp = _stack_content.get();
-      ss.ss_size = stack_size;
+      ss.ss_sp = altstack;
+      ss.ss_size = altstack_size;
       ss.ss_flags = 0;
       if (sigaltstack(&ss, nullptr) < 0) {
         success = false;
@@ -4190,7 +4189,7 @@ class SignalHandling {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
 #endif
-      action.sa_sigaction = &sig_handler;
+      action.sa_sigaction = handler;
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
@@ -4200,9 +4199,21 @@ class SignalHandling {
         success = false;
     }
 
-    _loaded = success;
+    return success;
   }
 
+  SignalHandling(const std::vector<int> &posix_signals,
+                 void (*handler)(int, siginfo_t *, void *))
+    : _loaded(false) {
+    const size_t stack_size = 1024 * 1024 * 8;
+    _stack_content.reset(static_cast<char *>(malloc(stack_size)));
+    _loaded = installHandler(posix_signals, handler, _stack_content.get(),
+                             stack_size);
+  }
+
+  SignalHandling(const std::vector<int> &posix_signals = make_default_signals())
+      : SignalHandling(posix_signals, sig_handler) {}
+
   bool loaded() const { return _loaded; }
 
   static void handleSignal(int, siginfo_t *info, void *_ctx) {