Apply patch from Brian Carlson to fix #170953; don't print offending

data in md5sum, it may not be NULL terminated.

diff --git a/ChangeLog b/ChangeLog
index e9ae30f43f6fb57c608d78ccadaf9473fdb4ffd9..9f9a6981852e8efba3569ac041f9e922a39c6b87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  8 18:55:13 GMT 2004 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+
+  * utils/md5sum.c: Don't print offending lines as they may not be NULL
+  terminated.
+
 Mon Mar  8 18:34:16 GMT 2004 Goswin Brederlow <brederlo@informatik.uni-tuebingen.de>
 
   * lib/parse.c, main/processarc.c: Store Architecture in the status file

diff --git a/THANKS b/THANKS
index 3f35978aa69ef7ef469b026f02894817d896ac76..fa003868a69c7053caaf8b072587daa41d6e9aba 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ Alberto Garcia <berto@gpul.org>
 Andrew Hobson <ahobson@eng.mindspring.net>
 Ben Collins <bcollins@debian.org>
 Branko Lankester
+Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 Bruce Perens <bruce@pixar.com>
 Carl Streeter <streeter@cae.wisc.edu>
 Carlos Laviola <claviola@brfree.com.br>

diff --git a/debian/changelog b/debian/changelog
index 9cc07f2cf8498bc4b1f17d67e96d70ad2ef6dfba..9831b7c975514b036877cb5dc076209c96dc4893 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ dpkg (1.10.19) unstable; urgency=low
   * Fix dpkg-buildpackage when used with PGP.  Closes: #232916.
   * Update support for Debian FreeBSD.  Closes: #211566.
   * Store Architecture in the status file.  Closes: #228253.
+  * Don't print offending lines in md5sum.  Closes: #170953.
 
  -- Scott James Remnant <scott@netsplit.com>  UNRELEASED
 

diff --git a/utils/md5sum.c b/utils/md5sum.c
index 1d5340b00822678dd3a9fa8128861ee7bde8837f..dc55a98a7aee3dfbe3e7539ecc373da13eec074b 100644 (file)
--- a/utils/md5sum.c
+++ b/utils/md5sum.c
@@ -236,7 +236,10 @@ get_md5_line(FILE *fp, unsigned char *digest, char *file)
        else if (*p == '*')
                rc = 2;
        else {
-               fprintf(stderr, _("%s: unrecognized line: %s"), progname, buf);
+               /* Don't print the buffer; we might be dealing with a
+                * non-text file.
+                */
+               fprintf(stderr, _("%s: unrecognized line\n"), progname);
                return 0;
        }
        ++p;