dovecot-2.1: istream-seekable: If underlying stream gives an err...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/4de62bda5244
changeset: 14964:4de62bda5244
user:      Timo Sirainen <tss at iki.fi>
date:      Sun May 12 17:09:10 2013 +0300
description:
istream-seekable: If underlying stream gives an error at EOF, don't hide it.

diffstat:

 src/lib/istream-seekable.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 4e633c2f9738 -r 4de62bda5244 src/lib/istream-seekable.c
--- a/src/lib/istream-seekable.c	Thu May 09 12:32:38 2013 +0300
+++ b/src/lib/istream-seekable.c	Sun May 12 17:09:10 2013 +0300
@@ -130,12 +130,12 @@
 	}
 
 	while ((ret = i_stream_read(sstream->cur_input)) < 0) {
-		if (!sstream->cur_input->eof) {
-			/* full / error */
+		if (sstream->cur_input->stream_errno != 0) {
 			sstream->istream.istream.stream_errno =
 				sstream->cur_input->stream_errno;
 			return -1;
 		}
+		i_assert(sstream->cur_input->eof);
 
 		/* go to next stream */
 		sstream->cur_input = sstream->input[sstream->cur_idx++];