From: Timo Sirainen <tss@iki.fi>
Date: Mon, 26 Nov 2012 21:23:52 +0000 (+0200)
Subject: lib-imap-storage: When returning an error istream, give it a useful name.
X-Git-Tag: 2.2.beta1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b0284ea5d2fb419aa7aa2f1ecfd80217026b764;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-storage: When returning an error istream, give it a useful name.
---

diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c
index 1fe4dabcd0..c697f32ed5 100644
--- a/src/lib-imap-storage/imap-msgpart.c
+++ b/src/lib-imap-storage/imap-msgpart.c
@@ -412,7 +412,7 @@ imap_msgpart_crlf_seek(struct mail *mail, struct istream *input,
 		       const struct imap_msgpart *msgpart)
 {
 	struct mail_msgpart_partial_cache *cache = &mail->box->partial_cache;
-	struct istream *crlf_input;
+	struct istream *crlf_input, *errinput;
 	uoff_t physical_start = input->v_offset;
 	uoff_t virtual_skip = msgpart->partial_offset;
 	bool cr_skipped;
@@ -432,8 +432,11 @@ imap_msgpart_crlf_seek(struct mail *mail, struct istream *input,
 		   message parts. */
 		skip_using_parts(mail, input, physical_start, &virtual_skip);
 	}
-	if (message_skip_virtual(input, virtual_skip, &cr_skipped) < 0)
-		return i_stream_create_error(errno);
+	if (message_skip_virtual(input, virtual_skip, &cr_skipped) < 0) {
+		errinput = i_stream_create_error(errno);
+		i_stream_set_name(errinput, i_stream_get_name(input));
+		return errinput;
+	}
 
 	if ((msgpart->partial_offset != 0 ||
 	     msgpart->partial_size != (uoff_t)-1) && !input->eof) {