about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2022-07-21 12:12:08 +0200
committerFlorian Weimer <fweimer@redhat.com>2022-07-21 16:33:04 +0200
commitac8047cdf326504f652f7db97ec96c0e0cee052f (patch)
treed74a86968b1d297541e13302521e0a6170238570 /malloc
parent8b84fb862c3c212b294b5f7bf443cb8372dc5376 (diff)
downloadglibc-ac8047cdf326504f652f7db97ec96c0e0cee052f.tar.gz
glibc-ac8047cdf326504f652f7db97ec96c0e0cee052f.tar.xz
glibc-ac8047cdf326504f652f7db97ec96c0e0cee052f.zip
malloc: Simplify implementation of __malloc_assert
It is prudent not to run too much code after detecting heap
corruption, and __fxprintf is really complex.  The line number
and file name do not carry much information, so it is not included
in the error message.  (__libc_message only supports %s formatting.)
The function name and assertion should provide some context.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 12908b8f97..bd3c76ed31 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -292,19 +292,14 @@
 # define __assert_fail(assertion, file, line, function)			\
 	 __malloc_assert(assertion, file, line, function)
 
-extern const char *__progname;
-
-static void
+_Noreturn static void
 __malloc_assert (const char *assertion, const char *file, unsigned int line,
 		 const char *function)
 {
-  (void) __fxprintf (NULL, "%s%s%s:%u: %s%sAssertion `%s' failed.\n",
-		     __progname, __progname[0] ? ": " : "",
-		     file, line,
-		     function ? function : "", function ? ": " : "",
-		     assertion);
-  fflush (stderr);
-  abort ();
+  __libc_message (do_abort, "\
+Fatal glibc error: malloc assertion failure in %s: %s\n",
+		  function, assertion);
+  __builtin_unreachable ();
 }
 #endif
 #endif