diff options
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert-perr.c | 36 | ||||
| -rw-r--r-- | assert/assert.c | 36 |
2 files changed, 42 insertions, 30 deletions
diff --git a/assert/assert-perr.c b/assert/assert-perr.c index 597ac5efb4..1342207c02 100644 --- a/assert/assert-perr.c +++ b/assert/assert-perr.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> #include <sysdep.h> +#include <unistd.h> extern const char *__progname; @@ -53,25 +54,30 @@ __assert_perror_fail (int errnum, FATAL_PREPARE; #endif - (void) __asprintf (&buf, _("%s%s%s:%u: %s%sUnexpected error: %s.\n"), - __progname, __progname[0] ? ": " : "", - file, line, - function ? function : "", function ? ": " : "", - __strerror_r (errnum, errbuf, sizeof errbuf)); - - /* Print the message. */ + if (__asprintf (&buf, _("%s%s%s:%u: %s%sUnexpected error: %s.\n"), + __progname, __progname[0] ? ": " : "", + file, line, + function ? function : "", function ? ": " : "", + __strerror_r (errnum, errbuf, sizeof errbuf)) >= 0) + { + /* Print the message. */ #ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - (void) __fwprintf (stderr, L"%s", buf); - else + if (_IO_fwide (stderr, 0) > 0) + (void) __fwprintf (stderr, L"%s", buf); + else #endif - (void) fputs (buf, stderr); + (void) fputs (buf, stderr); - (void) fflush (stderr); + (void) fflush (stderr); - /* We have to free the buffer since the appplication might catch the - SIGABRT. */ - free (buf); + /* We have to free the buffer since the appplication might catch the + SIGABRT. */ + free (buf); + } + else + /* At least print a minimal message. */ +#define STR_N_LEN(str) str, sizeof (str) - 1 + __libc_write (STDERR_FILENO, STR_N_LEN ("Unexpected error.\n")); abort (); } diff --git a/assert/assert.c b/assert/assert.c index df382456e3..6a9c4de55d 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> #include <sysdep.h> +#include <unistd.h> extern const char *__progname; @@ -51,25 +52,30 @@ __assert_fail (const char *assertion, const char *file, unsigned int line, FATAL_PREPARE; #endif - (void) __asprintf (&buf, _("%s%s%s:%u: %s%sAssertion `%s' failed.\n"), - __progname, __progname[0] ? ": " : "", - file, line, - function ? function : "", function ? ": " : "", - assertion); - - /* Print the message. */ + if (__asprintf (&buf, _("%s%s%s:%u: %s%sAssertion `%s' failed.\n"), + __progname, __progname[0] ? ": " : "", + file, line, + function ? function : "", function ? ": " : "", + assertion) >= 0) + { + /* Print the message. */ #ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - (void) __fwprintf (stderr, L"%s", buf); - else + if (_IO_fwide (stderr, 0) > 0) + (void) __fwprintf (stderr, L"%s", buf); + else #endif - (void) fputs (buf, stderr); + (void) fputs (buf, stderr); - (void) fflush (stderr); + (void) fflush (stderr); - /* We have to free the buffer since the appplication might catch the - SIGABRT. */ - free (buf); + /* We have to free the buffer since the appplication might catch the + SIGABRT. */ + free (buf); + } + else + /* At least print a minimal message. */ +#define STR_N_LEN(str) str, sizeof (str) - 1 + __libc_write (STDERR_FILENO, STR_N_LEN ("Unexpected error.\n")); abort (); } |