WIP make fatals abort (based on capstone commit)

cyrusimap · Jun 26, 2024 · be0699c · be0699c
1 parent 90d2bb5
commit be0699c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 2 deletions.
diff --git a/imap/calalarmd.c b/imap/calalarmd.c
@@ -76,6 +76,8 @@ EXPORTED void fatal(const char *msg, int err)
 
     cyrus_done();
 
+    if (err != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(err);
 }
 

diff --git a/imap/httpd.c b/imap/httpd.c
@@ -1235,6 +1235,9 @@ EXPORTED void fatal(const char* s, int code)
     }
 
     syslog(LOG_ERR, "%s%s", fatal, s);
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     shut_down(code);
 }
 

diff --git a/imap/idled.c b/imap/idled.c
@@ -113,6 +113,8 @@ EXPORTED void fatal(const char *msg, int err)
 
     cyrus_done();
 
+    if (err != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(err);
 }
 

diff --git a/imap/imapd.c b/imap/imapd.c
@@ -1443,6 +1443,9 @@ EXPORTED void fatal(const char *s, int code)
     }
 
     syslog(LOG_ERR, "Fatal error: %s", s);
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     shut_down(code);
 }
 

diff --git a/imap/lmtpd.c b/imap/lmtpd.c
@@ -1034,10 +1034,10 @@ EXPORTED void fatal(const char* s, int code)
 
     syslog(LOG_ERR, "FATAL: %s", s);
 
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     /* shouldn't return */
     shut_down(code);
-
-    exit(code);
 }
 
 /*

diff --git a/imap/pop3d.c b/imap/pop3d.c
@@ -674,6 +674,9 @@ EXPORTED void fatal(const char* s, int code)
         prot_flush(popd_out);
     }
     syslog(LOG_ERR, "Fatal error: %s", s);
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     shut_down(code);
 }
 

diff --git a/imap/promstatsd.c b/imap/promstatsd.c
@@ -87,6 +87,8 @@ EXPORTED void fatal(const char *msg, int err)
     syslog(LOG_CRIT, "%s", msg);
     syslog(LOG_NOTICE, "exiting");
 
+    if (err != EX_PROTOCOL && config_fatals_abort) abort();
+
     shut_down(err);
 }
 

diff --git a/imap/sync_client.c b/imap/sync_client.c
@@ -138,6 +138,9 @@ EXPORTED void fatal(const char *s, int code)
 {
     fprintf(stderr, "Fatal error: %s\n", s);
     syslog(LOG_ERR, "Fatal error: %s", s);
+
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(code);
 }
 

diff --git a/imap/sync_server.c b/imap/sync_server.c
@@ -465,6 +465,7 @@ EXPORTED void fatal(const char* s, int code)
         prot_flush(sync_out);
     }
     syslog(LOG_ERR, "Fatal error: %s", s);
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
     shut_down(code);
 }
 

diff --git a/lib/assert.c b/lib/assert.c
@@ -47,12 +47,15 @@
 #include "xmalloc.h"
 #include "assert.h"
 
+extern int config_fatals_abort;
+
 EXPORTED void
 assertionfailed(const char *file, int line, const char *expr)
 {
     char buf[1024];
 
     snprintf(buf, sizeof(buf), "Internal error: assertion failed: %s: %d%s%s",
             file, line, expr ? ": " : "", expr ? expr : "");
+    if (config_fatals_abort) abort();
     fatal(buf, EX_SOFTWARE);
 }
diff --git a/master/master.c b/master/master.c
@@ -212,6 +212,7 @@ EXPORTED void fatal(const char *msg, int code)
 {
     syslog(LOG_CRIT, "%s", msg);
     syslog(LOG_NOTICE, "exiting");
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
     exit(code);
 }
 

diff --git a/sieve/sieved.c b/sieve/sieved.c
@@ -60,6 +60,7 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include <inttypes.h>
+#include <sysexits.h>
 
 #include <string.h>
 
@@ -75,6 +76,8 @@ EXPORTED void fatal(const char *s, int code)
 {
     fprintf(stderr, "Fatal error: %s (%d)\r\n", s, code);
 
+    if (code != EX_PROTOCOL && config_fatals_abort) abort();
+
     exit(code);
 }