[FFmpeg-cvslog] zmbv: Reset the decoder on keyframe errors

[Luca Barbato]

ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Fri Jan 11 05:07:42 2013 +0100| [fbde7b2d0aebf2b0123f6a19f871a904322a5b45] | committer: Luca Barbato

zmbv: Reset the decoder on keyframe errors

Prevent the crash on fuzzed files as reported in bug 63.
(cherry picked from commit c1d1ef4ecd9c4f1ca01c8149c7e57c14968ca588)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

 libavcodec/zmbv.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 0733fa7..c92e553 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -428,6 +428,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
         c->fmt = buf[3];
         c->bw = buf[4];
         c->bh = buf[5];
+        c->decode_intra = NULL;
+        c->decode_xor = NULL;
 
         buf += 6;
         len -= 6;