Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8277:943955343653 HEAD
Added asserts.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Thu, 16 Oct 2008 12:38:25 +0300 |
parents | dcc80beecb40 |
children | 6b23fa31c553 |
files | src/lib-mail/message-header-parser.c src/lib/istream.c |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-mail/message-header-parser.c Thu Oct 16 14:49:37 2008 +0300 +++ b/src/lib-mail/message-header-parser.c Thu Oct 16 12:38:25 2008 +0300 @@ -110,6 +110,7 @@ /* stream is nonblocking - need more data */ return 0; } + i_assert(size > 0); if (msg[0] == '\n' || (msg[0] == '\r' && size > 1 && msg[1] == '\n')) {
--- a/src/lib/istream.c Thu Oct 16 14:49:37 2008 +0300 +++ b/src/lib/istream.c Thu Oct 16 12:38:25 2008 +0300 @@ -71,7 +71,11 @@ stream->stream_errno = 0; ret = _stream->read(_stream); - if (ret == -1) { + switch (ret) { + case -2: + i_assert(_stream->skip != _stream->pos); + break; + case -1: if (stream->stream_errno != 0) { /* error handling should be easier if we now just assume the stream is now at EOF */ @@ -79,8 +83,10 @@ } else { i_assert(stream->eof); } - } else { - i_assert(ret != 0 || !stream->blocking); + break; + case 0: + i_assert(!stream->blocking); + break; } return ret; }