commit 8210ee22e2f69d540f8835523dd78a205ae6c2a6
author Michael Niedermayer <michaelni@gmx.at> Thu Apr 21 22:04:21 2011 +0200
committer Michael Niedermayer <michaelni@gmx.at> Tue Apr 26 12:12:11 2011 +0200
tree b4bd256de6cfc6138a8b888954532b610d5ec020
parent 52ee20f2aa2936e0fb0a90e81c39135a8f2394e9

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>

libavcodec/sp5xdec.c

diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c
index 920b32d..f1e436c 100644
--- a/libavcodec/sp5xdec.c
+++ b/libavcodec/sp5xdec.c
@@ -88,7 +88,6 @@
     recoded[j++] = 0xFF;
     recoded[j++] = 0xD9;
 
-    avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
     i = ff_mjpeg_decode_frame(avctx, data, data_size, recoded, j);
 
     av_free(recoded);