From 9001cb1102cddba54f0e84e147dfbb0356067356 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 3 Aug 2022 11:41:53 +0200 Subject: assert: Do not use stderr in libc-internal assert Redirect internal assertion failures to __libc_assert_fail, based on based on __libc_message, which writes directly to STDERR_FILENO and calls abort. Also disable message translation and reword the error message slightly (adjusting stdlib/tst-bz20544 accordingly). As a result of these changes, malloc no longer needs its own redefinition of __assert_fail. __libc_assert_fail needs to be stubbed out during rtld dependency analysis because the rtld rebuilds turn __libc_assert_fail into __assert_fail, which is unconditionally provided by elf/dl-minimal.c. This change is not possible for the public assert macro and its __assert_fail function because POSIX requires that the diagnostic is written to stderr. Reviewed-by: Adhemerval Zanella --- assert/Makefile | 7 ++++++- assert/__libc_assert_fail.c | 33 +++++++++++++++++++++++++++++++++ assert/assert.c | 1 - 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 assert/__libc_assert_fail.c (limited to 'assert') diff --git a/assert/Makefile b/assert/Makefile index f7cf8e9b77..c905845a43 100644 --- a/assert/Makefile +++ b/assert/Makefile @@ -24,7 +24,12 @@ include ../Makeconfig headers := assert.h -routines := assert assert-perr __assert +routines := \ + __assert \ + __libc_assert_fail \ + assert \ + assert-perr \ + # routines tests := test-assert test-assert-perr tst-assert-c++ tst-assert-g++ ifeq ($(have-cxx-thread_local),yes) diff --git a/assert/__libc_assert_fail.c b/assert/__libc_assert_fail.c new file mode 100644 index 0000000000..149d5feae1 --- /dev/null +++ b/assert/__libc_assert_fail.c @@ -0,0 +1,33 @@ +/* libc-internal assert that calls __libc_message. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include <_itoa.h> +#include +#include +#include + +void +__libc_assert_fail (const char *assertion, const char *file, unsigned int line, + const char *function) +{ + char linebuf[INT_BUFSIZE_BOUND (unsigned int)]; + array_end (linebuf)[-1] = '\0'; + char *linestr = _itoa_word (line, array_end (linebuf) - 1, 10, 0); + __libc_message ("Fatal glibc error: %s:%s (%s): assertion failed: %s\n", + file, linestr, function, assertion); +} diff --git a/assert/assert.c b/assert/assert.c index 133a183bc3..564ae28a2b 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -101,4 +101,3 @@ __assert_fail (const char *assertion, const char *file, unsigned int line, __assert_fail_base (_("%s%s%s:%u: %s%sAssertion `%s' failed.\n%n"), assertion, file, line, function); } -hidden_def(__assert_fail) -- cgit 1.4.1