diff options
| author | Pádraig Brady <P@draigBrady.com> | 2010-11-10 14:35:17 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2010-11-11 01:40:12 +0000 |
| commit | 0339eb4598600024cedca14a7e882c1737dd2d82 (patch) | |
| tree | a83d8af40ed3fa2382f8720c0f74aaa8fad644f3 | |
| parent | 7727908335ef1049deac42851026ed8bf5ae2734 (diff) | |
| download | coreutils-0339eb4598600024cedca14a7e882c1737dd2d82.tar.xz | |
csplit: fix a memory leak per input buffer
* src/csplit.c (free_buffer): Also free the line offsets buffers
(remove_line): Also free the containing structure
* tests/misc/csplit-heap: A new test to trigger with leaks of
this magnitude.
* tests/Makefile.am: Reference the new test
* NEWS: Mention the fix
Reported by David Hofstee
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/csplit.c | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/misc/csplit-heap | 29 |
4 files changed, 41 insertions, 3 deletions
@@ -9,9 +9,9 @@ GNU coreutils NEWS -*- outline -*- latent bug introduced in coreutils 8.1, and possibly a second latent bug going at least as far back as coreutils 5.97] - csplit no longer corrupts heap when writing more than 999 files. - Demonstrate with: seq 1000 | csplit - /./ '{*}' - [the bug was present in the initial implementation] + csplit no longer corrupts heap when writing more than 999 files, + nor does it leak memory for every chunk of input processed + [the bugs were present in the initial implementation] tail -F once again notices changes in a currently unavailable remote directory [bug introduced in coreutils-7.5] diff --git a/src/csplit.c b/src/csplit.c index 57543f0a2..948a795e2 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -418,6 +418,13 @@ get_new_buffer (size_t min_size) static void free_buffer (struct buffer_record *buf) { + struct line *l; + for (l = buf->line_start; l;) + { + struct line *n = l->next; + free (l); + l = n; + } free (buf->buffer); buf->buffer = NULL; } @@ -542,6 +549,7 @@ remove_line (void) if (prev_buf) { free_buffer (prev_buf); + free (prev_buf); prev_buf = NULL; } diff --git a/tests/Makefile.am b/tests/Makefile.am index a3a30b6bd..90ff292a1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -173,6 +173,7 @@ TESTS = \ misc/comm \ misc/csplit \ misc/csplit-1000 \ + misc/csplit-heap \ misc/date-sec \ misc/dircolors \ misc/df \ diff --git a/tests/misc/csplit-heap b/tests/misc/csplit-heap new file mode 100755 index 000000000..0e7f8b2ef --- /dev/null +++ b/tests/misc/csplit-heap @@ -0,0 +1,29 @@ +#!/bin/sh +# ensure that csplit uses a bounded amount of memory + +# Copyright (C) 2010 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 <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../src +test "$VERBOSE" = yes && csplit --version + +require_ulimit_ + +( + ulimit -v 20000 + { yes | head -n2500000; echo n; } | csplit -z - %n%1 +) || fail=1 + +Exit $fail |