[FFmpeg-cvslog] zmbv: check decompress result

[Kostya Shishkov]

ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Sun Mar 18 09:11:39 2012 +0100| [bb39bd195a7dec3e8c7eb9ae4294f2fd0f548ed9] | committer: Kostya Shishkov

zmbv: check decompress result

Changing flush type from Z_FINISH is needed since encoder compresses fixed
amount of data and doesn't care about writing end of stream marker.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb39bd195a7dec3e8c7eb9ae4294f2fd0f548ed9
---

 libavcodec/zmbv.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 62045c0..49e15ff 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -512,7 +512,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
         c->zstream.avail_in = len;
         c->zstream.next_out = c->decomp_buf;
         c->zstream.avail_out = c->decomp_size;
-        inflate(&c->zstream, Z_FINISH);
+        zret = inflate(&c->zstream, Z_SYNC_FLUSH);
+        if (zret != Z_OK && zret != Z_STREAM_END) {
+            av_log(avctx, AV_LOG_ERROR, "inflate error %d\n", zret);
+            return AVERROR_INVALIDDATA;
+        }
         c->decomp_len = c->zstream.total_out;
     }
     if (c->flags & ZMBV_KEYFRAME) {