56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
diff -urNp coreutils-6.10-orig/src/md5sum.c coreutils-6.10/src/md5sum.c
|
|
--- coreutils-6.10-orig/src/md5sum.c 2007-11-25 14:23:31.000000000 +0100
|
|
+++ coreutils-6.10/src/md5sum.c 2008-04-15 21:04:09.000000000 +0200
|
|
@@ -205,6 +205,9 @@ bsd_split_3 (char *s, size_t s_len, unsi
|
|
{
|
|
size_t i;
|
|
|
|
+ if (s_len ==0)
|
|
+ return false;
|
|
+
|
|
*file_name = s;
|
|
|
|
/* Find end of filename. The BSD 'md5' and 'sha1' commands do not escape
|
|
diff -urNp coreutils-6.10-orig/src/md5sum.c coreutils-6.10/src/md5sum.c
|
|
--- coreutils-6.10-orig/src/md5sum.c 2008-04-18 17:40:03.000000000 +0200
|
|
+++ coreutils-6.10/src/md5sum.c 2008-04-18 17:48:05.000000000 +0200
|
|
@@ -346,6 +346,8 @@ split_3 (char *s, size_t s_len,
|
|
static bool
|
|
hex_digits (unsigned char const *s)
|
|
{
|
|
+ if (!*s)
|
|
+ return false;
|
|
while (*s)
|
|
{
|
|
if (!isxdigit (*s))
|
|
diff -urNp coreutils-6.10-orig/tests/misc/sha1sum coreutils-6.10/tests/misc/sha1sum
|
|
--- coreutils-6.10-orig/tests/misc/sha1sum 2007-12-13 00:14:28.000000000 +0100
|
|
+++ coreutils-6.10/tests/misc/sha1sum 2008-04-15 21:05:43.000000000 +0200
|
|
@@ -29,7 +29,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;
|
|
@@ -72,6 +72,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.
|
|
@@ -86,7 +88,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
|