diff options
Diffstat (limited to 'debug')
| -rw-r--r-- | debug/fortify_fail.c | 26 | ||||
| -rw-r--r-- | debug/stack_chk_fail.c | 7 |
2 files changed, 4 insertions, 29 deletions
diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c index 16549d6dbc..272a829fd4 100644 --- a/debug/fortify_fail.c +++ b/debug/fortify_fail.c @@ -16,33 +16,13 @@ <http://www.gnu.org/licenses/>. */ #include <stdio.h> -#include <stdlib.h> -#include <stdbool.h> - - -extern char **__libc_argv attribute_hidden; - -void -__attribute__ ((noreturn)) -__fortify_fail_abort (_Bool need_backtrace, const char *msg) -{ - /* The loop is added only to keep gcc happy. Don't pass down - __libc_argv[0] if we aren't doing backtrace since __libc_argv[0] - may point to the corrupted stack. */ - while (1) - __libc_message (need_backtrace ? (do_abort | do_backtrace) : do_abort, - "*** %s ***: %s terminated\n", - msg, - (need_backtrace && __libc_argv[0] != NULL - ? __libc_argv[0] : "<unknown>")); -} void __attribute__ ((noreturn)) __fortify_fail (const char *msg) { - __fortify_fail_abort (true, msg); + /* The loop is added only to keep gcc happy. */ + while (1) + __libc_message (do_abort, "*** %s ***: terminated\n", msg); } - libc_hidden_def (__fortify_fail) -libc_hidden_def (__fortify_fail_abort) diff --git a/debug/stack_chk_fail.c b/debug/stack_chk_fail.c index 4485655599..d4381dfa53 100644 --- a/debug/stack_chk_fail.c +++ b/debug/stack_chk_fail.c @@ -16,17 +16,12 @@ <http://www.gnu.org/licenses/>. */ #include <stdio.h> -#include <stdlib.h> -#include <stdbool.h> - - -extern char **__libc_argv attribute_hidden; void __attribute__ ((noreturn)) __stack_chk_fail (void) { - __fortify_fail_abort (false, "stack smashing detected"); + __fortify_fail ("stack smashing detected"); } strong_alias (__stack_chk_fail, __stack_chk_fail_local) |