From bb39bd195a7dec3e8c7eb9ae4294f2fd0f548ed9 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sun, 18 Mar 2012 09:11:39 +0100 Subject: 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. --- libavcodec/zmbv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavcodec/zmbv.c') diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 62045c087a..49e15ff7f9 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) { -- cgit v1.2.1