From c5bb8e2399f55c09a98c66936940ba744b5841da Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 29 Dec 2013 23:13:20 +0000 Subject: tests: unify fortification handler logic We have multiple tests that copy & paste the same logic for disabling the fortification output. Let's unify this in the test-skeleton instead. Signed-off-by: Mike Frysinger --- debug/tst-longjmp_chk.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'debug/tst-longjmp_chk.c') diff --git a/debug/tst-longjmp_chk.c b/debug/tst-longjmp_chk.c index dba1855f4a..e4e93d2a36 100644 --- a/debug/tst-longjmp_chk.c +++ b/debug/tst-longjmp_chk.c @@ -10,6 +10,12 @@ #include #include + +static int do_test(void); +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" + + static jmp_buf b; @@ -48,23 +54,7 @@ handler (int sig) static int do_test (void) { - 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); expected_to_fail = false; @@ -86,6 +76,3 @@ do_test (void) puts ("second longjmp returned"); return 1; } - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" -- cgit 1.4.1