Merge pull request #292 from CESNET/unwind-handle-sigabrt

SiskaPavel · web-flow · commit 0d22c81e5c57 · 2025-07-08T11:05:55.000+02:00
ipfixprobe.cpp: handle SIGABRT to support libunwind-based diagnostics
diff --git a/src/core/ipfixprobe.cpp b/src/core/ipfixprobe.cpp
@@ -64,9 +64,9 @@ const uint32_t DEFAULT_FPS = 0; // unlimited
 void signal_handler(int sig)
 {
 	(void) sig;
-	if (sig == SIGSEGV) {
+	if (sig == SIGSEGV || sig == SIGABRT) {
 		st_dump(STDERR_FILENO, sig);
-		abort();
+		exit(EXIT_FAILURE);
 	}
 	stop = 1;
 }
@@ -76,6 +76,7 @@ void register_handlers()
 	signal(SIGTERM, signal_handler);
 	signal(SIGINT, signal_handler);
 	signal(SIGSEGV, signal_handler);
+	signal(SIGABRT, signal_handler);
 #ifdef WITH_NEMEA
 	signal(SIGPIPE, SIG_IGN);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ const uint32_t DEFAULT_FPS = 0; // unlimited`
`64`	`64`	`void signal_handler(int sig)`
`65`	`65`	`{`
`66`	`66`	`(void) sig;`
`67`		`- if (sig == SIGSEGV) {`
	`67`	`+ if (sig == SIGSEGV \|\| sig == SIGABRT) {`
`68`	`68`	`st_dump(STDERR_FILENO, sig);`
`69`		`- abort();`
	`69`	`+ exit(EXIT_FAILURE);`
`70`	`70`	`}`
`71`	`71`	`stop = 1;`
`72`	`72`	`}`
`@@ -76,6 +76,7 @@ void register_handlers()`
`76`	`76`	`signal(SIGTERM, signal_handler);`
`77`	`77`	`signal(SIGINT, signal_handler);`
`78`	`78`	`signal(SIGSEGV, signal_handler);`
	`79`	`+ signal(SIGABRT, signal_handler);`
`79`	`80`	`#ifdef WITH_NEMEA`
`80`	`81`	`signal(SIGPIPE, SIG_IGN);`
`81`	`82`	`#endif`