dovecot-1.1: i_stream_read_data(): Fix for the previous fix..

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/336eabeae7fd
changeset: 7883:336eabeae7fd
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Sep 13 13:04:22 2008 +0300
description:
i_stream_read_data(): Fix for the previous fix..

diffstat:

1 file changed, 8 insertions(+), 5 deletions(-)
src/lib/istream.c |   13 ++++++++-----

diffs (23 lines):

diff -r 0e5422636bc4 -r 336eabeae7fd src/lib/istream.c
--- a/src/lib/istream.c	Sat Sep 13 13:02:31 2008 +0300
+++ b/src/lib/istream.c	Sat Sep 13 13:04:22 2008 +0300
@@ -294,11 +294,14 @@ int i_stream_read_data(struct istream *s
 		i_assert(!stream->blocking);
 		return 0;
 	}
-	if (read_more && stream->eof) {
-		/* we read at least some new data */
-		return 0;
-	}
-	i_assert(stream->stream_errno != 0);
+	if (stream->eof) {
+		if (read_more) {
+			/* we read at least some new data */
+			return 0;
+		}
+	} else {
+		i_assert(stream->stream_errno != 0);
+	}
 	return -1;
 }