fix regression in boundary scanning and test-suite

Paul J Stevens · Paul J Stevens · commit 2fc12d5f95dd · 2014-07-20T16:51:55.000+02:00
diff --git a/src/dm_message.c b/src/dm_message.c
@@ -376,7 +376,7 @@ static bool wrapped_boundary(const char *s, char *boundary)
 				break;
 			i++;
 		}
-		strncat(boundary, s, buflen);
+		strncat(boundary, s, min(i, buflen));
 
 		if (! s[i])
 			break;
diff --git a/test/check_dbmail.h b/test/check_dbmail.h
@@ -1563,31 +1563,31 @@ char *multipart_message8 = "From: nobody@example.org\n"
     "\n"
     "--_004_AAD42BB12C540843AB5C952ADD4D978901830A1Bswi52mbx1orfloc_--\";\n";
 
-char *multipart_message9 = "From: test\n"
-    "To: test\n"
-    "Subject: test\n"
-    "Date: Fri, 23 May 2014 17:09:58 +0200 (CEST)\n"
-    "Mime-Version: 1.0\n"
-    "Content-Type: multipart/alternative;\n"
-    "\tboundary*0=\"=_5be2c88172b006282613c4916282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d\";\n"
-    "\tboundary*1=\"6_=\"\n"
-    "\n"
-    "\n"
-    "--=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d6_=\n"
-    "Content-Type: text/plain;\n"
-    "	charset=utf-8\n"
-    "Content-Transfer-Encoding: quoted-printable\n"
-    "\n"
-    "=0A=\n"
-    "\n"
-    "--=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d6_=\n"
-    "Content-Type: text/html;\n"
-    "	charset=utf-8\n"
-    "Content-Transfer-Encoding: quoted-printable\n"
-    "\n"
-    "<html></html>\n"
-    "\n"
-    "--=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d6_=--\n";
+char *multipart_message9 = "From: a\n"
+	"To: b\n"
+	"Subject: c\n"
+	"Date: Fri, 23 May 2014 17:09:58 +0200 (CEST)\n"
+	"Content-Type: multipart/alternative;\n"
+	"\tboundary*0=\"=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d\";\n"
+	" boundary*1=\"6_=\"\n"
+	"\n"
+	"\n"
+	"--=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d6_=\n"
+	"Content-Type: text/plain;\n"
+	" charset=utf-8\n"
+	"Content-Transfer-Encoding: quoted-printable\n"
+	"\n"
+	"Hi=0A=\n"
+	"\n"
+	"--=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d6_=\n"
+	"Content-Type: text/html;\n"
+	" charset=utf-8\n"
+	"Content-Transfer-Encoding: quoted-printable\n"
+	"\n"
+	"<html><body>Hi</body></html>=\n"
+	"--=_5be2c88172b006282613c491=0e67d269-8f6d-5f77-bc5a-dedf278583d6_=--\n"
+	"\n";
+
 
 char *multipart_message_big = "From: \"Gennadiy Poryev\" <vecanoi@gmail.com>\n"
 "To: \"Gennadiy Poryev\" <core@barvinok.net>\n"
diff --git a/test/check_dbmail_message.c b/test/check_dbmail_message.c
@@ -188,7 +188,6 @@ START_TEST(test_dbmail_message_store)
 {
 	DbmailMessage *m;
 	char *t, *e;
-	
 	//-----------------------------------------
 	m = message_init("From: paul\n");
 	e = dbmail_message_to_string(m);

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ static bool wrapped_boundary(const char s, char boundary)`
`376`	`376`	`break;`
`377`	`377`	`i++;`
`378`	`378`	`}`
`379`		`- strncat(boundary, s, buflen);`
	`379`	`+ strncat(boundary, s, min(i, buflen));`
`380`	`380`
`381`	`381`	`if (! s[i])`
`382`	`382`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,6 @@ START_TEST(test_dbmail_message_store)`
`188`	`188`	`{`
`189`	`189`	`DbmailMessage *m;`
`190`	`190`	`char t, e;`
`191`		`-`
`192`	`191`	`//-----------------------------------------`
`193`	`192`	`m = message_init("From: paul\n");`
`194`	`193`	`e = dbmail_message_to_string(m);`