dovecot-1.2: Added asserts.

dovecot at dovecot.org dovecot at dovecot.org
Thu Oct 16 15:20:37 EEST 2008


details:   http://hg.dovecot.org/dovecot-1.2/rev/116202a99576
changeset: 8280:116202a99576
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Oct 16 15:19:42 2008 +0300
description:
Added asserts.

diffstat:

1 file changed, 4 insertions(+), 2 deletions(-)
src/lib-mail/istream-header-filter.c |    6 ++++--

diffs (29 lines):

diff -r 444f0d5bfcbc -r 116202a99576 src/lib-mail/istream-header-filter.c
--- a/src/lib-mail/istream-header-filter.c	Thu Oct 16 15:00:44 2008 +0300
+++ b/src/lib-mail/istream-header-filter.c	Thu Oct 16 15:19:42 2008 +0300
@@ -243,12 +243,12 @@ static ssize_t read_header(struct header
 	   the body will be returned in separate read() call. */
 	mstream->istream.buffer = buffer_get_data(mstream->hdr_buf, &pos);
 	ret = (ssize_t)(pos - mstream->istream.pos - mstream->istream.skip);
+	i_assert(ret >= 0);
 	mstream->istream.pos = pos;
 
 	if (hdr_ret == 0) {
 		/* need more data to finish parsing headers. we may have some
 		   data already available though. */
-		i_assert(ret >= 0);
 		return ret;
 	}
 
@@ -310,8 +310,10 @@ static ssize_t i_stream_header_filter_re
 
 	stream->buffer = i_stream_get_data(stream->parent, &pos);
 	if (pos <= stream->pos) {
-		if ((ret = i_stream_read(stream->parent)) == -2)
+		if ((ret = i_stream_read(stream->parent)) == -2) {
+			i_assert(stream->skip != stream->pos);
 			return -2;
+		}
 		stream->istream.stream_errno = stream->parent->stream_errno;
 		stream->istream.eof = stream->parent->eof;
 		stream->buffer = i_stream_get_data(stream->parent, &pos);


More information about the dovecot-cvs mailing list