zlib: Fixed zlib/bzlib ostream flushing to report correctly when it's finished.

This caused imap-zlib plugin to eat all CPU when stream compression was used.
Patch by Apple.

--HG--
branch : HEAD

diff --git a/src/plugins/zlib/ostream-bzlib.c b/src/plugins/zlib/ostream-bzlib.c
index ccbcb3ebc5c6329cb87dc88fc2312bb2173760ec..ad0d41dc7b3fcf48f326c9652ea3a7692947b607 100644 (file)
--- a/src/plugins/zlib/ostream-bzlib.c
+++ b/src/plugins/zlib/ostream-bzlib.c
@@ -122,15 +122,15 @@ static int o_stream_bzlib_send_flush(struct bzlib_ostream *zstream)
 static int o_stream_bzlib_flush(struct ostream_private *stream)
 {
        struct bzlib_ostream *zstream = (struct bzlib_ostream *)stream;
+       int ret;
 
        if (o_stream_bzlib_send_flush(zstream) < 0)
                return -1;
 
-       if (o_stream_flush(zstream->output) < 0) {
+       ret = o_stream_flush(zstream->output);
+       if (ret < 0)
                zstream_copy_error(zstream);
-               return -1;
-       }
-       return 0;
+       return ret;
 }
 
 static ssize_t

diff --git a/src/plugins/zlib/ostream-zlib.c b/src/plugins/zlib/ostream-zlib.c
index 6e5d83b472899bae84a8cd1962d40ad6cef026f9..750e852d1632c2bbb283e5656855106da8718602 100644 (file)
--- a/src/plugins/zlib/ostream-zlib.c
+++ b/src/plugins/zlib/ostream-zlib.c
@@ -184,15 +184,15 @@ static int o_stream_zlib_send_flush(struct zlib_ostream *zstream)
 static int o_stream_zlib_flush(struct ostream_private *stream)
 {
        struct zlib_ostream *zstream = (struct zlib_ostream *)stream;
+       int ret;
 
        if (o_stream_zlib_send_flush(zstream) < 0)
                return -1;
 
-       if (o_stream_flush(zstream->output) < 0) {
+       ret = o_stream_flush(zstream->output);
+       if (ret < 0)
                zstream_copy_error(zstream);
-               return -1;
-       }
-       return 0;
+       return ret;
 }
 
 static ssize_t