Module: libav
Branch: release/9
Commit: fbde7b2d0aebf2b0123f6a19f871a904322a5b45

Author:    Luca Barbato <[email protected]>
Committer: Luca Barbato <[email protected]>
Date:      Fri Jan 11 05:07:42 2013 +0100

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 <[email protected]>

---

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

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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to