From 7cb24684cc4ef96bb25dfc1c819acfc3b98d9442 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 15 Apr 2008 08:19:11 +0200 Subject: md5sum, sha1sum, etc: handle invalid input (i.e., don't segfault) * src/md5sum.c (bsd_split_3): Return right away if s_len == 0. * tests/misc/md5sum (bsd-segv): New test for the above. * tests/misc/sha1sum (bsd-segv): Likewise. * NEWS: Mention the bug fix. Reported by Cristian Cadar, Daniel Dunbar and Dawson Engler. --- tests/misc/sha1sum | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/misc/sha1sum') diff --git a/tests/misc/sha1sum b/tests/misc/sha1sum index b7d288fa2..452236d8d 100755 --- a/tests/misc/sha1sum +++ b/tests/misc/sha1sum @@ -1,7 +1,7 @@ #!/bin/sh # Test "sha1sum". -# Copyright (C) 2000, 2003, 2005-2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2003, 2005-2008 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 @@ -24,7 +24,7 @@ exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - <<\EOF require 5.003; use strict; -(my $program_name = $0) =~ s|.*/||; +my $prog = 'sha1sum'; # Turn off localisation of executable's ouput. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; @@ -66,6 +66,8 @@ my @Tests = ['check-bsd3', '--check', '--status', {IN=> {'f.sha1' => "SHA1 (f) = $sha_degenerate\n"}}, {AUX=> {f=> 'bar'}}, {EXIT=> 1}], + ['bsd-segv', '--check', {IN=> {'z' => "SHA1 ("}}, {EXIT=> 1}, + {ERR=> "$prog: z: no properly formatted SHA1 checksum lines found\n"}], ); # Insert the `--text' argument for each test. @@ -78,7 +80,6 @@ foreach $t (@Tests) my $save_temps = $ENV{DEBUG}; my $verbose = $ENV{VERBOSE}; -my $prog = 'sha1sum'; -my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose); +my $fail = run_tests ($prog, $prog, \@Tests, $save_temps, $verbose); exit $fail; EOF -- cgit v1.2.3-70-g09d2