Windows bug fixes - record signal, add reset func

- Tests show Windows was not rethrowing if exception was cause using `raise()`
-  always use `RaiseException` to throw

Author: TheTechsTech

include/exception.h

@@ -162,6 +162,9 @@ C_API void ex_signal(int sig, const char *ex);
 /* Convert signals into exceptions */
 C_API void ex_signal_setup(void);
 
+/* Reset signal handler to default */
+C_API void ex_signal_default(void);
+
 #ifdef _WIN32
 #define EXCEPTION_PANIC 0xE0000001
 C_API void ex_signal_seh(DWORD sig, const char *ex);
@@ -215,10 +218,6 @@ enum {
 #define ex_longjmp(buf,st) longjmp(buf,st)
 #endif
 
-
-#define rethrow() \
-    ex_throw(ex_err.ex, ex_err.file, ex_err.line, ex_err.function, ex_err.panic)
-
 #define ex_throw_loc(E, F, L, C)           \
     do                                  \
     {                                   \
@@ -237,13 +236,20 @@ throws an exception of given message. */
 
 #ifdef _WIN32
 #define throw(E) raii_panic(EX_STR(E))
-#define ex_signal_block(ctrl)                  \
-    CRITICAL_SECTION ctrl##__FUNCTION__; \
+
+#define rethrow()                   \
+    if (ex_err.caught > -1)         \
+        ex_err.state = ex_throw_st; \
+    else                            \
+        ex_throw(ex_err.ex, ex_err.file, ex_err.line, ex_err.function, ex_err.panic)
+
+#define ex_signal_block(ctrl)               \
+    CRITICAL_SECTION ctrl##__FUNCTION__;    \
     InitializeCriticalSection(&ctrl##__FUNCTION__); \
     EnterCriticalSection(&ctrl##__FUNCTION__);
 
-#define ex_signal_unblock(ctrl)                  \
-    LeaveCriticalSection(&ctrl##__FUNCTION__); \
+#define ex_signal_unblock(ctrl)                 \
+    LeaveCriticalSection(&ctrl##__FUNCTION__);  \
     DeleteCriticalSection(&ctrl##__FUNCTION__);
 
 #define ex_try                              \
@@ -306,6 +312,7 @@ throws an exception of given message. */
     if (ex_context == &ex_err)              \
         /* global context updated */        \
         ex_context = ex_err.next;           \
+    ex_err.caught = -1;                     \
     if ((ex_err.state & ex_throw_st) != 0)  \
         rethrow();                          \
     }
@@ -321,6 +328,9 @@ throws an exception of given message. */
 #define ex_signal_unblock(ctrl)                  \
     pthread_sigmask(SIG_SETMASK, &ctrl_all##__FUNCTION__, NULL);
 
+#define rethrow()  \
+    ex_throw(ex_err.ex, ex_err.file, ex_err.line, ex_err.function, ex_err.panic)
+
 #define throw(E) \
     ex_throw_loc(E, __FILE__, __LINE__, __FUNCTION__)
 #define ex_try                              \
@@ -400,6 +410,7 @@ struct ex_context_s {
     void *data;
     void *prev;
     bool is_unwind;
+    int volatile caught;
 
     /* The handler in the stack (which is a FILO container). */
     ex_context_t *next;

src/exception.c

@@ -204,6 +204,7 @@ ex_context_t *ex_init(void) {
     ex_signal_block(all);
     ex_context = &ex_context_buffer;
     ex_context->is_unwind = false;
+    ex_context->caught = -1;
     ex_context->type = ex_context_st;
     ex_signal_unblock(all);
 
@@ -259,8 +260,7 @@ void ex_throw(const char *exception, const char *file, int line, const char *fun
         ex_terminate();
 
 #ifdef _WIN32
-    if (!is_empty((void *)message))
-        RaiseException(EXCEPTION_PANIC, 0, 0, 0);
+    RaiseException(EXCEPTION_PANIC, 0, 0, 0);
 #endif
     ex_longjmp(ctx->buf, ctx->state | ex_throw_st);
 }
@@ -272,7 +272,10 @@ int catch_seh(const char *exception, DWORD code, struct _EXCEPTION_POINTERS *ep)
     int i;
 
     for (i = 0; i < max_ex_sig; i++) {
-        if (ex_sig[i].ex == exception || is_str_eq(ctx->panic, exception)) {
+        if (is_str_eq(ex_sig[i].ex, exception)
+            || is_str_eq(ctx->panic, exception)
+            || ex_sig[i].seh == code
+            || ctx->caught == ex_sig[i].seh) {
             ctx->state = ex_throw_st;
             ctx->ex = ex_sig[i].ex;
             ctx->file = "unknown";
@@ -299,7 +302,7 @@ int catch_filter_seh(DWORD code, struct _EXCEPTION_POINTERS *ep) {
     }
 
     for (i = 0; i < max_ex_sig; i++) {
-        if (ex_sig[i].seh == code) {
+        if (ex_sig[i].seh == code || ctx->caught == ex_sig[i].seh) {
             ctx->state = ex_throw_st;
             ctx->ex = ex_sig[i].ex;
             ctx->file = "unknown";
@@ -352,13 +355,34 @@ void ex_handler(int sig) {
     for (i = 0; i < max_ex_sig; i++) {
         if (ex_sig[i].sig == sig) {
             ex = ex_sig[i].ex;
+            ex_init()->caught = sig;
             break;
         }
     }
 
     ex_throw(ex, "unknown", 0, NULL, NULL);
 }
 
+void ex_signal_reset(int sig) {
+#if defined(_WIN32) || defined(_WIN64)
+    if (signal(sig, SIG_DFL) == SIG_ERR)
+        fprintf(stderr, "Cannot install handler for signal no %d\n",
+                sig);
+#else
+    /*
+     * Make signal handlers persistent.
+     */
+    ex_sig_sa.sa_handler = SIG_DFL;
+    if (sigemptyset(&ex_sig_sa.sa_mask) != 0)
+        fprintf(stderr, "Cannot setup handler for signal no %d (%s)\n",
+                sig, ex);
+    else if (sigaction(sig, &ex_sig_sa, NULL) != 0)
+        fprintf(stderr, "Cannot restore handler for signal no %d (%s)\n",
+                sig, ex);
+#endif
+    exception_signal_set = false;
+}
+
 void ex_signal(int sig, const char *ex) {
     int i;
 
@@ -468,3 +492,60 @@ void ex_signal_setup(void) {
     ex_signal(SIG_BUS, EX_NAME(sig_bus));
 #endif
 }
+
+void ex_signal_default(void) {
+#ifdef SIGSEGV
+    ex_signal_reset(SIGSEGV);
+#endif
+
+#if defined(SIGABRT)
+    ex_signal_reset(SIGABRT);
+#endif
+
+#ifdef SIGFPE
+    ex_signal_reset(SIGFPE);
+#endif
+
+#ifdef SIGILL
+    ex_signal_reset(SIGILL);
+#endif
+
+#ifdef SIGBREAK
+    ex_signal_reset(SIGBREAK);
+#endif
+
+#ifdef SIGINT
+    ex_signal_reset(SIGINT);
+#endif
+
+#ifdef SIGTERM
+    ex_signal_reset(SIGTERM);
+#endif
+
+#if !defined(_WIN32)
+#ifdef SIGQUIT
+    ex_signal_reset(SIGQUIT);
+#endif
+
+#ifdef SIGHUP
+    ex_signal_reset(SIGHUP);
+#endif
+
+#ifdef SIGWINCH
+    ex_signal_reset(SIGWINCH);
+#endif
+#ifdef SIGTRAP
+    ex_signal_reset(SIGTRAP);
+#endif
+#endif
+
+#ifdef SIGALRM
+    ex_signal_reset(SIGALRM);
+#endif
+
+#ifdef SIGBUS
+    ex_signal_reset(SIGBUS);
+#elif SIG_BUS
+    ex_signal_reset(SIG_BUS);
+#endif
+}