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:43:04 +0200 |
| commit | 9001cb1102cddba54f0e84e147dfbb0356067356 (patch) | |
| tree | 752100897824af704ceb553e42867960e41a87f7 /include | |
| parent | 68e036f27f31c3378201702e182246504fb00f87 (diff) | |
| download | glibc-9001cb1102cddba54f0e84e147dfbb0356067356.zip glibc-9001cb1102cddba54f0e84e147dfbb0356067356.tar.gz glibc-9001cb1102cddba54f0e84e147dfbb0356067356.tar.bz2 | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/assert.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/assert.h b/include/assert.h index 61cc8aa..c812808 100644 --- a/include/assert.h +++ b/include/assert.h @@ -20,8 +20,14 @@ extern void __assert_fail_base (const char *fmt, const char *assertion, const char *function) __THROW __attribute__ ((__noreturn__)) attribute_hidden; -# if IS_IN (libc) || (IS_IN (rtld) && !defined NO_RTLD_HIDDEN) -hidden_proto (__assert_fail) -hidden_proto (__assert_perror_fail) +rtld_hidden_proto (__assert_fail) +rtld_hidden_proto (__assert_perror_fail) +libc_hidden_proto (__assert_perror_fail) + + +# if IS_IN (libc) +/* Redirect to the internal version which does not use stderr. */ +extern _Noreturn __typeof (__assert_fail) __libc_assert_fail attribute_hidden; +# define __assert_fail __libc_assert_fail # endif #endif |