From 02242448bf431a69fd0b8c929ca4408a05479baa Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Tue, 2 Jun 2015 10:32:25 -0300 Subject: Avoid outputting to TTY after an expected memory corruption in testcase Protect TTY against an expected memory corruption from testcase tst-malloc-backtrace, which is expected to SIGABRT after a forced memory corruption. --- test-skeleton.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'test-skeleton.c') diff --git a/test-skeleton.c b/test-skeleton.c index 1332c94a86..9ee5001440 100644 --- a/test-skeleton.c +++ b/test-skeleton.c @@ -218,6 +218,22 @@ signal_handler (int sig __attribute__ ((unused))) exit (1); } +/* Avoid all the buffer overflow messages on stderr. */ +static void +__attribute__ ((unused)) +ignore_stderr (void) +{ + 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 fortification error handler. Used when tests want to verify that bad code is caught by the library. */ static void @@ -231,17 +247,7 @@ set_fortify_handler (void (*handler) (int sig)) 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); + ignore_stderr (); } /* We provide the entry point here. */ -- cgit 1.4.1