lib-sieve: message body: Fixed assert failure occurring when text extraction...

lib-sieve: message body: Fixed assert failure occurring when text extraction is attempted on a empty or broken text part.

lib-sieve: message body: Fixed assert failure occurring when text extraction...
57a7d70e · Stephan Bosch · 62c8bcaf · 57a7d70e · 57a7d70e
Commit 57a7d70e authored 9 years ago by Stephan Bosch
--- a/src/lib-sieve/sieve-message.c
+++ b/src/lib-sieve/sieve-message.c
@@ -974,7 +974,7 @@ static void sieve_message_part_save
 	if ( extract_text && body_part->children == NULL &&
 		!body_part->epilogue ) {
-		if ( mail_html2text_content_type_match
+		if ( buf->used > 0 && mail_html2text_content_type_match
 			(body_part->content_type) ) {
 			struct mail_html2text *html2text;

--- a/tests/extensions/body/text.svtest
+++ b/tests/extensions/body/text.svtest
@@ -182,3 +182,44 @@ test "Nested Search" {
 	}
 }
+/*
+ * Broken/Empty parts
+ */
+test_set "message" text:
+From: Whomever <whoever@example.com>
+To: Someone <someone@example.com>
+Date: Sat, 10 Oct 2009 00:30:04 +0200
+Subject: whatever
+Content-Type: multipart/mixed; boundary=outer
+This is a multi-part message in MIME format.
+--outer
+Content-Type: text/html
+--outer
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: multipart/related
+Content-Disposition: inline
+<html><body>Please say Hello</body></html>
+--outer--
+This is the end of the outer MIME multipart.
+.
+;
+test "Nested Search" {
+	if body :text :contains "Hello" {
+		test_fail "Cannot match empty/broken part";
+	}
+	if body :text :contains ["<html>", "body"] {
+		test_fail "erroneously matched text/html markup";
+	}
+	if body :text :contains "MIME" {
+		test_fail "erroneously matched multipart prologue/epilogue text";
+	}
+}