From: Doug Morris <doug@mhost.com>
Date: Tue, 28 Mar 2000 14:42:36 +0000 (+0000)
Subject: added Todd Miller's packf patch
X-Git-Tag: nmh-1_0~51
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=e7f0dbf0856b7eb1f97f4c95fe39497b1ca97998

added Todd Miller's packf patch
---

diff --git a/ChangeLog b/ChangeLog
index 9caf15e..b03b6e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Mar 28 16:17:39 2000 Doug Morris <doug@mhost.com>
+
+	* applied Todd Miller's <Todd.Miller@courtesan.com> patch to
+	dropsbr.c to prevent core dumping on packf. Here's the note
+	from his message:
+
+	  Since sizeof(buffer) == sizeof(tmpbuffer) packf will dump
+	  core on a file w/o a From line with a line >= BUFSIZ.
+	  I noticed this because I had a junk file in my mail
+	  spool somehow.
+
 Fri Mar 17 11:59:33 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
 	* wesley.craig@umich.edu did not document his previous KPOP patch,
diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 857263a..cc35f5f 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -408,8 +408,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
 			ep = "nobody@nowhere";
 			tp = dctime(dlocaltimenow());
-			snprintf (buffer, sizeof(buffer), "From %s  %s", ep, tp);
-			strcat (buffer, tmpbuffer);
+			snprintf (buffer, sizeof(buffer), "From %s  %s%s", ep, tp, tmpbuffer);
 		    }
 		}