From 4b95adc9f2ec340f80d4b9ee81938d1070de0c67 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 19 Dec 2009 22:17:02 +0100 Subject: [PATCH] dprintf-posix: Check against memory leak fixed on 2009-12-15. --- ChangeLog | 9 ++++ modules/dprintf-posix-tests | 7 ++- tests/test-dprintf-posix2.c | 109 +++++++++++++++++++++++++++++++++++++++++++ tests/test-dprintf-posix2.sh | 31 ++++++++++++ 4 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 tests/test-dprintf-posix2.c create mode 100755 tests/test-dprintf-posix2.sh diff --git a/ChangeLog b/ChangeLog index 2f1309ef5..014e8f546 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-12-19 Bruno Haible + dprintf-posix: Check against memory leak fixed on 2009-12-15. + * tests/test-dprintf-posix2.sh: New file. + * tests/test-dprintf-posix2.c: New file. + * modules/dprintf-posix-tests (Files): Add them. + (configure.ac): Check for getrlimit and setrlimit. + (Makefile.am): Augment TESTS and CHECK_PROGRAMS. + +2009-12-19 Bruno Haible + fprintf-posix: Check against memory leak fixed on 2009-12-15. * tests/test-fprintf-posix3.sh: New file. * tests/test-fprintf-posix3.c: New file. diff --git a/modules/dprintf-posix-tests b/modules/dprintf-posix-tests index 487c974e8..652f2893d 100644 --- a/modules/dprintf-posix-tests +++ b/modules/dprintf-posix-tests @@ -2,13 +2,16 @@ Files: tests/test-dprintf-posix.sh tests/test-dprintf-posix.c tests/test-printf-posix.output +tests/test-dprintf-posix2.sh +tests/test-dprintf-posix2.c Depends-on: stdint configure.ac: +AC_CHECK_FUNCS_ONCE([getrlimit setrlimit]) Makefile.am: -TESTS += test-dprintf-posix.sh +TESTS += test-dprintf-posix.sh test-dprintf-posix2.sh TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='$(srcdir)' -check_PROGRAMS += test-dprintf-posix +check_PROGRAMS += test-dprintf-posix test-dprintf-posix2 diff --git a/tests/test-dprintf-posix2.c b/tests/test-dprintf-posix2.c new file mode 100644 index 000000000..96d42e488 --- /dev/null +++ b/tests/test-dprintf-posix2.c @@ -0,0 +1,109 @@ +/* Test of POSIX compatible dprintf() function. + Copyright (C) 2009 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2009. */ + +#include + +#include + +#if HAVE_GETRLIMIT && HAVE_SETRLIMIT + +#include +#include +#include +#include +#include +#include +#include + +/* Test against a memory leak in the fprintf replacement. */ + +/* Number of iterations across the loop. */ +#define NUM_ROUNDS 1000 + +/* Number of bytes that are allowed to escape per round. */ +#define MAX_ALLOC_ROUND 10000 + +/* Number of bytes that are allowed to escape in total. + This should be at least 10 MB, since it includes the normal memory + or address space of the test program. */ +#define MAX_ALLOC_TOTAL (NUM_ROUNDS * MAX_ALLOC_ROUND) + +int +main (int argc, char *argv[]) +{ + struct rlimit limit; + int arg; + int repeat; + + /* Limit the amount of malloc()ed memory to MAX_ALLOC_TOTAL or less. */ + + /* On BSD systems, malloc() is limited by RLIMIT_DATA. */ +#ifdef RLIMIT_DATA + if (getrlimit (RLIMIT_DATA, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL) + limit.rlim_max = MAX_ALLOC_TOTAL; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_DATA, &limit) < 0) + return 77; +#endif + /* On Linux systems, malloc() is limited by RLIMIT_AS. */ +#ifdef RLIMIT_AS + if (getrlimit (RLIMIT_AS, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > MAX_ALLOC_TOTAL) + limit.rlim_max = MAX_ALLOC_TOTAL; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_AS, &limit) < 0) + return 77; +#endif + + arg = atoi (argv[1]); + if (arg == 0) + { + void *memory = malloc (MAX_ALLOC_TOTAL); + if (memory == NULL) + return 1; + memset (memory, 17, MAX_ALLOC_TOTAL); + return 78; + } + + /* Perform the test and test whether it triggers a permanent memory + allocation of more than MAX_ALLOC_TOTAL bytes. */ + + for (repeat = 0; repeat < NUM_ROUNDS; repeat++) + { + /* This may produce a temporary memory allocation of 11000 bytes. + but should not result in a permanent memory allocation. */ + if (dprintf (STDOUT_FILENO, "%011000d\n", 17) == -1 + && errno == ENOMEM) + return 1; + } + + return 0; +} + +#else + +int +main (int argc, char *argv[]) +{ + return 77; +} + +#endif diff --git a/tests/test-dprintf-posix2.sh b/tests/test-dprintf-posix2.sh new file mode 100755 index 000000000..f1aeacc71 --- /dev/null +++ b/tests/test-dprintf-posix2.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Test against a memory leak. + +(./test-dprintf-posix2${EXEEXT} 0 + result=$? + if test $result != 77 && test $result != 78; then result=1; fi + exit $result +) 2>/dev/null +malloc_result=$? +if test $malloc_result = 77; then + echo "Skipping test: getrlimit and setrlimit don't work" + exit 77 +fi + +./test-dprintf-posix2${EXEEXT} 1 > /dev/null +result=$? +if test $result = 77; then + echo "Skipping test: getrlimit and setrlimit don't work" + exit 77 +fi +if test $result != 0; then + exit 1 +fi + +if test $malloc_result = 78; then + echo "Skipping test: getrlimit and setrlimit don't work" + exit 77 +fi + +exit 0 -- 2.11.0