CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-05 08:10:15 +02:00
Code Issues Projects Releases Wiki Activity

sort -m: don't segfault when output file is also an input file

Browse Source 
* src/sort.c (avoid_trashing_input): Fix an off-by-one error and
guard the use of memmove.
* NEWS (Bug fixes): Mention it.
* tests/misc/sort: Add tests to exercise the offending code.
* THANKS: Update.
Reported by Otavio Salvador in http://bugs.debian.org/525048.
This commit is contained in:
Jim Meyering
2009-04-22 08:45:27 +02:00
parent f41f926aab
commit 25eb4c6909
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+5 -1
View File
@@ -1,9 +1,13 @@
GNU coreutils NEWS -*- outline -*-
* Noteworthy changes in release ?.? (????-??-??) [?]
* Noteworthy changes in release 7.3 (????-??-??) [?]
** Bug fixes
sort -m no longer segfaults when its output file is also an input file.
E.g., with this, touch 1; sort -m -o 1 1, sort would segfault.
[introduced in coreutils-7.2]
ls now aligns output correctly in the presence of abbreviated month
names from the locale database that have differing widths.
THANKS
+1
View File
@@ -435,6 +435,7 @@ Ole Laursen olau@hardworking.dk
Oliver Kiddle okiddle@yahoo.co.uk
Ørn E. Hansen oehansen@daimi.aau.dk
Oskar Liljeblad osk@hem.passagen.se
Otavio Salvador otavio@ossystems.com.br
Pádraig Brady P@draigBrady.com
Patrick Mauritz oxygene@studentenbude.ath.cx
Paul D. Smith psmith@gnu.org
src/sort.c
+6 -4
View File
@@ -1,5 +1,5 @@
/* sort - sort lines of text (with all kinds of options).
Copyright (C) 1988, 1991-2008 Free Software Foundation, Inc.
Copyright (C) 1988, 1991-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
@@ -2602,18 +2602,20 @@ avoid_trashing_input (struct sortfile *files, size_t ntemps,
pid_t pid;
char *temp = create_temp (&tftp, &pid);
size_t num_merged = 0;
while (i + num_merged < nfiles)
do
{
num_merged += mergefiles (&files[i], 0, nfiles - i, tftp, temp);
files[i].name = temp;
files[i].pid = pid;
memmove(&files[i], &files[i + num_merged],
num_merged * sizeof *files);
if (i + num_merged < nfiles)
memmove(&files[i + 1], &files[i + num_merged],
num_merged * sizeof *files);
ntemps += 1;
nfiles -= num_merged - 1;;
i += num_merged;
}
while (i < nfiles);
}
}
tests/misc/sort
+16 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# Copyright (C) 2008 Free Software Foundation, Inc.
# Copyright (C) 2008, 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
@@ -339,6 +339,21 @@ my @Tests =
["sort-numeric", '--sort=numeric', {IN=>".01\n0\n"}, {OUT=>"0\n.01\n"}],
["sort-gennum", '--sort=general-numeric',
{IN=>"1e2\n2e1\n"}, {OUT=>"2e1\n1e2\n"}],
# -m with output file also used as an input file
# In coreutils-7.2, this caused a segfault.
# This test looks a little strange. Here's why:
# since we're using "-o f", standard output will be empty, hence OUT=>''
# We still want to ensure that the output file, "f" has expected contents,
# hence the added CMP=> directive.
["output-is-input", '-m -o f', {IN=> {f=> "a\n"}}, {OUT=>''},
{CMP=> ["a\n", {'f'=> undef}]} ],
["output-is-input-2", '-m -o f', {OUT=>''},
{IN=> {f=> "a\n"}}, {IN=> {g=> "b\n"}}, {IN=> {h=> "c\n"}},
{CMP=> ["a\nb\nc\n", {'f'=> undef}]} ],
["output-is-input-3", '-m -o f', {OUT=>''},
{IN=> {g=> "a\n"}}, {IN=> {h=> "b\n"}}, {IN=> {f=> "c\n"}},
{CMP=> ["a\nb\nc\n", {'f'=> undef}]} ],
);
# Add _POSIX2_VERSION=199209 to the environment of each test