From cca9684f2d7a74fc0b28bfb1859955e0e28d7b4b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 3 Aug 2022 11:41:53 +0200 Subject: stdio: Clean up __libc_message after unconditional abort Since commit ec2c1fcefb200c6cb7e09553f3c6af8815013d83 ("malloc: Abort on heap corruption, without a backtrace [BZ #21754]"), __libc_message always terminates the process. Since commit a289ea09ea843ced6e5277c2f2e63c357bc7f9a3 ("Do not print backtraces on fatal glibc errors"), the backtrace facility has been removed. Therefore, remove enum __libc_message_action and the action argument of __libc_message, and mark __libc_message as _No_return. Reviewed-by: Adhemerval Zanella --- malloc/malloc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'malloc') diff --git a/malloc/malloc.c b/malloc/malloc.c index 430d204..b2017c8 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -297,8 +297,7 @@ _Noreturn static void __malloc_assert (const char *assertion, const char *file, unsigned int line, const char *function) { - __libc_message (do_abort, "\ -Fatal glibc error: malloc assertion failure in %s: %s\n", + __libc_message ("Fatal glibc error: malloc assertion failure in %s: %s\n", function, assertion); __builtin_unreachable (); } @@ -5658,7 +5657,7 @@ static void malloc_printerr (const char *str) { #if IS_IN (libc) - __libc_message (do_abort, "%s\n", str); + __libc_message ("%s\n", str); #else __libc_fatal (str); #endif -- cgit v1.1