Added asserts.

--HG--
branch : HEAD

diff --git a/src/lib-mail/message-header-parser.c b/src/lib-mail/message-header-parser.c
index d4af80c0879e31771e0bb1d522204ca61319c163..055598dba8f4a012a459cbc1eef7da105f224c8a 100644 (file)
--- a/src/lib-mail/message-header-parser.c
+++ b/src/lib-mail/message-header-parser.c
@@ -110,6 +110,7 @@ int message_parse_header_next(struct message_header_parser_ctx *ctx,
                                /* stream is nonblocking - need more data */
                                return 0;
                        }
+                       i_assert(size > 0);
 
                        if (msg[0] == '\n' ||
                            (msg[0] == '\r' && size > 1 && msg[1] == '\n')) {

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 77214ddc05f96d4a138e5fba21271204da32bee5..fc88c9515b9c7c0593eed34e050422e866eaf94d 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -71,7 +71,11 @@ ssize_t i_stream_read(struct istream *stream)
        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 @@ ssize_t i_stream_read(struct istream *stream)
                } else {
                        i_assert(stream->eof);
                }
-       } else {
-               i_assert(ret != 0 || !stream->blocking);
+               break;
+       case 0:
+               i_assert(!stream->blocking);
+               break;
        }
        return ret;
 }