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 /stdlib | |
| parent | 68e036f27f31c3378201702e182246504fb00f87 (diff) | |
| download | glibc-9001cb1102cddba54f0e84e147dfbb0356067356.tar.gz glibc-9001cb1102cddba54f0e84e147dfbb0356067356.tar.xz glibc-9001cb1102cddba54f0e84e147dfbb0356067356.zip | |
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 'stdlib')
| -rw-r--r-- | stdlib/tst-bz20544.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stdlib/tst-bz20544.c b/stdlib/tst-bz20544.c index 411cd3f3ba..7cc236a1b1 100644 --- a/stdlib/tst-bz20544.c +++ b/stdlib/tst-bz20544.c @@ -78,7 +78,7 @@ test_bz20544_cxa_at_quick_exit (void *closure) static void test_one_fn (void (*test_fn) (void *)) { - const char expected_error[] = "Assertion `func != NULL' failed.\n"; + const char expected_error[] = "assertion failed: func != NULL\n"; struct support_capture_subprocess result; result = support_capture_subprocess (test_fn, NULL); support_capture_subprocess_check (&result, "bz20544", -SIGABRT, |