From: Timo Sirainen <tss@iki.fi>
Date: Thu, 4 Nov 2010 16:25:18 +0000 (+0000)
Subject: istream-concat: Fixed error handling when one of the stream read()s failed.
X-Git-Tag: 2.0.7~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64c48ffb71f1cf99acf375768fde4cff9b512648;p=thirdparty%2Fdovecot%2Fcore.git

istream-concat: Fixed error handling when one of the stream read()s failed.
---

diff --git a/src/lib/istream-concat.c b/src/lib/istream-concat.c
index 49bafa279c..655627ae55 100644
--- a/src/lib/istream-concat.c
+++ b/src/lib/istream-concat.c
@@ -126,7 +126,7 @@ static ssize_t i_stream_concat_read(struct istream_private *stream)
 		if (ret == -2 || ret == 0)
 			return ret;
 
-		if (ret == -1 && stream->istream.stream_errno != 0) {
+		if (ret == -1 && cstream->cur_input->stream_errno != 0) {
 			stream->istream.stream_errno =
 				cstream->cur_input->stream_errno;
 			return -1;