diff options
Diffstat (limited to 'benchtests/bench-strcpy_chk.c')
-rw-r--r-- | benchtests/bench-strcpy_chk.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/benchtests/bench-strcpy_chk.c b/benchtests/bench-strcpy_chk.c index 8accb61..828c9bc 100644 --- a/benchtests/bench-strcpy_chk.c +++ b/benchtests/bench-strcpy_chk.c @@ -53,6 +53,9 @@ simple_strcpy_chk (char *dst, const char *src, size_t len) #include <setjmp.h> #include <signal.h> +static int test_main (void); +#include "../test-skeleton.c" + volatile int chk_fail_ok; jmp_buf chk_fail_buf; @@ -156,28 +159,12 @@ do_test (size_t align1, size_t align2, size_t len, size_t dlen, int max_char) putchar ('\n'); } -int +static int test_main (void) { size_t i; - struct sigaction sa; - sa.sa_handler = handler; - sa.sa_flags = 0; - sigemptyset (&sa.sa_mask); - - sigaction (SIGABRT, &sa, NULL); - - /* Avoid all the buffer overflow messages on stderr. */ - int fd = open (_PATH_DEVNULL, O_WRONLY); - if (fd == -1) - close (STDERR_FILENO); - else - { - dup2 (fd, STDERR_FILENO); - close (fd); - } - setenv ("LIBC_FATAL_STDERR_", "1", 1); + set_fortify_handler (handler); test_init (); @@ -254,5 +241,3 @@ test_main (void) return 0; } - -#include "../test-skeleton.c" |