From: Timo Sirainen <tss@iki.fi>
Date: Fri, 3 Dec 2010 10:15:48 +0000 (+0000)
Subject: dbox: Fixed reading attachments for compressed mails.
X-Git-Tag: 2.0.8~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc45e0ed5178181de36c5efbf8a0698891e10726;p=thirdparty%2Fdovecot%2Fcore.git

dbox: Fixed reading attachments for compressed mails.
---

diff --git a/src/lib-storage/index/dbox-common/dbox-attachment.c b/src/lib-storage/index/dbox-common/dbox-attachment.c
index c99d321977..f38a4a7cee 100644
--- a/src/lib-storage/index/dbox-common/dbox-attachment.c
+++ b/src/lib-storage/index/dbox-common/dbox-attachment.c
@@ -146,7 +146,7 @@ dbox_attachment_file_get_stream_from(struct dbox_file *file,
 	const struct mail_attachment_extref *extref;
 	struct istream **inputs, *input, *input2;
 	const char *path, *path_suffix;
-	uoff_t last_voffset = 0;
+	uoff_t psize, last_voffset = 0;
 	unsigned int i;
 
 	t_array_init(&extrefs_arr, 16);
@@ -185,9 +185,9 @@ dbox_attachment_file_get_stream_from(struct dbox_file *file,
 		array_append(&streams, &input, 1);
 	}
 
-	if (file->cur_physical_size != (*stream)->v_offset) {
-		uoff_t trailer_size = file->cur_physical_size -
-			(*stream)->v_offset;
+	psize = dbox_file_get_plaintext_size(file);
+	if (psize != (*stream)->v_offset) {
+		uoff_t trailer_size = psize - (*stream)->v_offset;
 
 		input = i_stream_create_limit(*stream, trailer_size);
 		array_append(&streams, &input, 1);