From 843c75ae69c8caaae60dd4bd00de6ccbc2a467cf Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Thu, 8 May 2025 20:36:25 +0200
Subject: [PATCH] chore(safe_main): work around Windows-specific issue in
 cpptrace

---
 tools/src/tool/safe_main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/src/tool/safe_main.cpp b/tools/src/tool/safe_main.cpp
index 8365cafb..d254eea2 100644
--- a/tools/src/tool/safe_main.cpp
+++ b/tools/src/tool/safe_main.cpp
@@ -52,6 +52,7 @@
 namespace dwarfs::tool {
 
 int safe_main(std::function<int(void)> const& fn) {
+  int retval{1};
   DWARFS_TRY {
     install_signal_handlers();
     setup_default_locale();
@@ -59,7 +60,7 @@ int safe_main(std::function<int(void)> const& fn) {
     ::_set_abort_behavior(0, _WRITE_ABORT_MSG);
 #endif
 
-    return fn();
+    retval = fn();
   }
   DWARFS_CATCH(...) {
     std::cerr << "ERROR: " << exception_str(std::current_exception()) << "\n";
@@ -74,7 +75,7 @@ int safe_main(std::function<int(void)> const& fn) {
 #endif
 #endif
   }
-  return 1;
+  return retval;
 }
 
 } // namespace dwarfs::tool