X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2f00e89cc181a9dc9206f2c613789a2e70be1214..b19b165203124e56cdcb89539efa6f93ed14f99d:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 371d0c92..d12fbb30 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1677,7 +1677,7 @@ static int
 openBase64 (CT ct, char **file)
 {
     int	bitno, cc, digested;
-    int fd, len, skip, own_ct_fp = 0;
+    int fd, len, skip, own_ct_fp = 0, text = ct->c_type == CT_TEXT;
     uint32_t bits;
     unsigned char value, b;
     char *cp, *ep, buffer[BUFSIZ];
@@ -1789,17 +1789,20 @@ openBase64 (CT ct, char **file)
 test_end:
 		    if ((bitno -= 6) < 0) {
 		    	b = (bits >> 16) & 0xff;
-			putc ((char) b, ce->ce_fp);
+			if (!text || b != '\r')
+			    putc ((char) b, ce->ce_fp);
 			if (digested)
 			    MD5Update (&mdContext, &b, 1);
 			if (skip < 2) {
 			    b = (bits >> 8) & 0xff;
-			    putc ((char) b, ce->ce_fp);
+			    if (! text || b != '\r')
+				putc ((char) b, ce->ce_fp);
 			    if (digested)
 				MD5Update (&mdContext, &b, 1);
 			    if (skip < 1) {
 			    	b = bits & 0xff;
-				putc ((char) b, ce->ce_fp);
+				if (! text || b != '\r')
+				    putc ((char) b, ce->ce_fp);
 				if (digested)
 				    MD5Update (&mdContext, &b, 1);
 			    }