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

Luca Barbato git at videolan.org
Fri Jan 11 13:43:45 CET 2013


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

zmbv: Reset the decoder on keyframe errors

Prevent the crash on fuzzed files as reported in bug 63.

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

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

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 8e0db8b..5d4254a 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;



More information about the ffmpeg-cvslog mailing list