From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 21 Apr 2011 20:04:21 +0000 (+0200)
Subject: AMV: Fix possibly exploitable crash.
X-Git-Tag: n0.8~820
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=89f903b3d5ec38c9c5d90fba7e626fa0eda61a32;p=coroid%2Fffmpeg_saccubus.git

AMV: Fix possibly exploitable crash.
Reported-at: Thu, 21 Apr 2011 14:38:25 +0000
Reported-by: Dominic Chell <Dominic.Chell@ngssecure.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 8bcdbe41b..dd31edaf8 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -86,7 +86,6 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
     recoded[j++] = 0xFF;
     recoded[j++] = 0xD9;
 
-    avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
     av_init_packet(&avpkt_recoded);
     avpkt_recoded.data = recoded;
     avpkt_recoded.size = j;
@@ -121,6 +120,6 @@ AVCodec ff_amv_decoder = {
     NULL,
     ff_mjpeg_decode_end,
     sp5x_decode_frame,
-    CODEC_CAP_DR1,
+    0,
     .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
 };