diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-08-03 11:41:53 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-08-03 11:42:39 +0200 |
| commit | cca9684f2d7a74fc0b28bfb1859955e0e28d7b4b (patch) | |
| tree | f07de8d03a36b0d91b7053a88af8d7818b0af20e /malloc/malloc.c | |
| parent | fccadcdf5bed7ee67a6cef4714e0b477d6c8472c (diff) | |
| download | glibc-cca9684f2d7a74fc0b28bfb1859955e0e28d7b4b.zip glibc-cca9684f2d7a74fc0b28bfb1859955e0e28d7b4b.tar.gz glibc-cca9684f2d7a74fc0b28bfb1859955e0e28d7b4b.tar.bz2 | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
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 |