From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 29 Apr 2016 22:05:47 +0000 (+0300)
Subject: lib-fs: Fixed fs_get_metadata() with fs-metawrap
X-Git-Tag: 2.3.0.rc1~3881
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22b0b59ada158df7f00fd01d0c138317a843a546;p=thirdparty%2Fdovecot%2Fcore.git

lib-fs: Fixed fs_get_metadata() with fs-metawrap

If mail was already read to EOF.
---

diff --git a/src/lib-fs/fs-metawrap.c b/src/lib-fs/fs-metawrap.c
index ee187b9609..0e9f09f70d 100644
--- a/src/lib-fs/fs-metawrap.c
+++ b/src/lib-fs/fs-metawrap.c
@@ -220,8 +220,12 @@ fs_metawrap_get_metadata(struct fs_file *_file,
 			if (fs_wait_async(_file->fs) < 0)
 				return -1;
 		}
-		if (ret == -1)
+		if (ret == -1 && file->input->stream_errno != 0) {
+			fs_set_error(_file->fs, "read(%s) failed: %s",
+				     i_stream_get_name(file->input),
+				     i_stream_get_error(file->input));
 			return -1;
+		}
 		i_assert(file->metadata_read);
 	}
 	*metadata_r = &_file->metadata;