From 5256f6122e9843b1e9988a742ed6c2a4923bc2bd Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Thu, 16 Jun 2011 21:44:42 +0200
Subject: mimedecode: Fix multipart/mixed detection.

Fixes a regression introduced in release 5.0.0 in March 1999 that was
attributed to Henrik Storner.

(cherry-pick from master, e45e718a80379391f8ba457e64e19f75f061741a)
---
 unmime.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'unmime.c')

diff --git a/unmime.c b/unmime.c
index f799ff92..5f743e36 100644
--- a/unmime.c
+++ b/unmime.c
@@ -459,7 +459,7 @@ int MimeBodyType(char *hdrs, int WantDecode)
 
 	/* Check Content-Type to see if this is a multipart message */
 	if ( (CntType != NULL) &&
-		((strncasecmp(CntType, "multipart/mixed", 16) == 0) ||
+		((strncasecmp(CntType, "multipart/mixed", 15) == 0) ||
 		 (strncasecmp(CntType, "message/", 8) == 0)) ) {
 
 	    char *p1 = GetBoundary(CntType);
@@ -469,7 +469,6 @@ int MimeBodyType(char *hdrs, int WantDecode)
 		   the boundary string */
 		strcpy(MultipartDelimiter, "--");
 		strlcat(MultipartDelimiter, p1, sizeof(MultipartDelimiter));
-		MultipartDelimiter[sizeof(MultipartDelimiter)-1] = '\0';
 		BodyType = (MSG_IS_8BIT | MSG_NEEDS_DECODE);
 	    }
 	}
-- 
cgit v1.2.3