From: Scott James Remnant <keybuk@debian.org>
Date: Mon, 8 Mar 2004 18:56:39 +0000 (+0000)
Subject: Apply patch from Brian Carlson to fix #170953; don't print offending
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=965650cff0cf8baccd453a551030bb3093bb4a26;p=dpkg

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 e9ae30f4..9f9a6981 100644
--- 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 3f35978a..fa003868 100644
--- 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 9cc07f2c..9831b7c9 100644
--- 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 1d5340b0..dc55a98a 100644
--- 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;