Packets: Fix VariantParser invalid parser access bug

[senf.git] / Utils / Exception.cc

diff --git a/Utils/Exception.cc b/Utils/Exception.cc
index 61d5860..b2c750f 100644 (file)
--- a/Utils/Exception.cc
+++ b/Utils/Exception.cc
@@ -27,6 +27,10 @@
 //#include "Exception.ih"
 
 // Custom includes
+#include <execinfo.h>
+#include <sstream>
+#include "../config.hh"
+#include "Backtrace.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
@@ -34,6 +38,23 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::Exception
 
+#ifdef SENF_DEBUG
+prefix_ void senf::ExceptionMixin::addBacktrace()
+{
+    void * entries[SENF_DEBUG_BACKTRACE_NUMCALLERS];
+    unsigned nEntries( ::backtrace(entries, SENF_DEBUG_BACKTRACE_NUMCALLERS) );
+
+    std::stringstream ss;
+    ss << "\nException at\n";
+    formatBacktrace(ss, entries, nEntries);
+    ss << "-- \n" << message_;
+    message_ = ss.str();
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////////// 
+// senf::Exception
+
 prefix_ senf::Exception::~Exception()
     throw()
 {}
@@ -41,17 +62,22 @@ prefix_ senf::Exception::~Exception()
 prefix_ char const * senf::Exception::what()
     const throw()
 {
-    return message_.c_str();
+    return message().c_str();
 }
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::SystemException
 
-prefix_ void senf::SystemException::init(std::string const & descr, int code)
+prefix_ void senf::SystemException::init(std::string const & descr, int code
+                                         _SENF_EXC_DEBUG_ARGS_ND)
 {
     code_ = code;
+#   ifdef SENF_DEBUG
+    if (file && line)
+        (*this) << "Exception at " << file << ":" << line << "\n";
+#   endif
     (*this) << "[" << errorString() << "]";
-    if (! descr.empty()) (*this) << "; " << descr;
+    if (! descr.empty()) (*this) << " " << descr;
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////