AMV: Fix possibly exploitable crash.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Apr 2011 20:04:21 +0000 (22:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Apr 2011 20:44:55 +0000 (22:44 +0200)
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>
libavcodec/sp5xdec.c

index 8bcdbe4..dd31eda 100644 (file)
@@ -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"),
 };