From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 27 Nov 2017 12:42:36 +0000 (+0200)
Subject: lib: Make sure panics/fatals don't recurse into loops
X-Git-Tag: 2.3.0.rc1~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86ec225534ca0e042149eab2458a2a9720db09ae;p=thirdparty%2Fdovecot%2Fcore.git

lib: Make sure panics/fatals don't recurse into loops
---

diff --git a/src/lib/failures.c b/src/lib/failures.c
index 61a48189d2..7494f7c436 100644
--- a/src/lib/failures.c
+++ b/src/lib/failures.c
@@ -69,8 +69,12 @@ static const char *get_log_stamp_format(const char *format_arg ATTR_UNUSED,
 
 void failure_exit(int status)
 {
-	if (failure_exit_callback != NULL)
+	static bool recursed = FALSE;
+
+	if (failure_exit_callback != NULL && !recursed) {
+		recursed = TRUE;
 		failure_exit_callback(&status);
+	}
 	exit(status);
 }
 
@@ -205,11 +209,15 @@ static void ATTR_NORETURN
 default_fatal_finish(enum log_type type, int status)
 {
 	const char *backtrace;
+	static int recursed = 0;
 
-	if (type == LOG_TYPE_PANIC || status == FATAL_OUTOFMEM) {
+	recursed++;
+	if ((type == LOG_TYPE_PANIC || status == FATAL_OUTOFMEM) &&
+	    recursed == 1) {
 		if (backtrace_get(&backtrace) == 0)
 			i_error("Raw backtrace: %s", backtrace);
 	}
+	recursed--;
 
 	if (type == LOG_TYPE_PANIC || getenv("CORE_ERROR") != NULL ||
 	    (status == FATAL_OUTOFMEM && getenv("CORE_OUTOFMEM") != NULL))