public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/release/2.34/master] malloc: Simplify implementation of __malloc_assert
@ 2022-07-21 15:27 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2022-07-21 15:27 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b2f32e746492615a6eb3e66fac1e766e32e8deb1
commit b2f32e746492615a6eb3e66fac1e766e32e8deb1
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Jul 21 12:12:08 2022 +0200
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>
(cherry picked from commit ac8047cdf326504f652f7db97ec96c0e0cee052f)
Diff:
---
malloc/malloc.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 7882c70f0a..d31e985ecc 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -294,19 +294,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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-21 15:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-21 15:27 [glibc/release/2.34/master] malloc: Simplify implementation of __malloc_assert Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).