dovecot-2.2: istream-base64: Fixed returning -2 too early.

dovecot at dovecot.org dovecot at dovecot.org
Wed Aug 22 15:18:45 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/5cf1cedb75e6
changeset: 14948:5cf1cedb75e6
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 22 15:18:39 2012 +0300
description:
istream-base64: Fixed returning -2 too early.

diffstat:

 src/lib/istream-base64-decoder.c |  2 +-
 src/lib/istream-base64-encoder.c |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 8377786d750a -r 5cf1cedb75e6 src/lib/istream-base64-decoder.c
--- a/src/lib/istream-base64-decoder.c	Wed Aug 22 15:13:21 2012 +0300
+++ b/src/lib/istream-base64-decoder.c	Wed Aug 22 15:18:39 2012 +0300
@@ -90,7 +90,7 @@
 		post_count = stream->pos - stream->skip;
 	} while (ret == 0 && pre_count == post_count);
 
-	if (ret < 0)
+	if (ret < 0 && pre_count == post_count)
 		return ret;
 
 	i_assert(post_count > pre_count);
diff -r 8377786d750a -r 5cf1cedb75e6 src/lib/istream-base64-encoder.c
--- a/src/lib/istream-base64-encoder.c	Wed Aug 22 15:13:21 2012 +0300
+++ b/src/lib/istream-base64-encoder.c	Wed Aug 22 15:18:39 2012 +0300
@@ -116,7 +116,7 @@
 		post_count = stream->pos - stream->skip;
 	} while (ret == 0 && pre_count == post_count);
 
-	if (ret < 0)
+	if (ret < 0 && pre_count == post_count)
 		return ret;
 
 	i_assert(post_count > pre_count);


More information about the dovecot-cvs mailing list