zlib: Potential assert-crashfix.

diff --git a/src/plugins/zlib/istream-bzlib.c b/src/plugins/zlib/istream-bzlib.c
index 946c22e99c9b7a7eb2cdd139a025a6b94c898421..d627c574298489c19087da91d0d94ea86348c2a1 100644 (file)
--- a/src/plugins/zlib/istream-bzlib.c
+++ b/src/plugins/zlib/istream-bzlib.c
@@ -50,7 +50,8 @@ static ssize_t i_stream_bzlib_read(struct istream_private *stream)
 
        high_offset = stream->istream.v_offset + (stream->pos - stream->skip);
        if (zstream->eof_offset == high_offset) {
-               i_assert(zstream->high_pos == 0);
+               i_assert(zstream->high_pos == 0 ||
+                        zstream->high_pos == stream->pos);
                stream->istream.eof = TRUE;
                return -1;
        }

diff --git a/src/plugins/zlib/istream-zlib.c b/src/plugins/zlib/istream-zlib.c
index 026036fa35f126d4dbd98203a167381996296374..79c6ac8e7be5f605bd914debe99e3e73560a9fe5 100644 (file)
--- a/src/plugins/zlib/istream-zlib.c
+++ b/src/plugins/zlib/istream-zlib.c
@@ -170,7 +170,8 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream)
 
        high_offset = stream->istream.v_offset + (stream->pos - stream->skip);
        if (zstream->eof_offset == high_offset) {
-               i_assert(zstream->high_pos == 0);
+               i_assert(zstream->high_pos == 0 ||
+                        zstream->high_pos == stream->pos);
                if (!zstream->trailer_read) {
                        do {
                                ret = i_stream_zlib_read_trailer(zstream);