[FFmpeg-cvslog] gifdec: reset previous Graphic Control Extension disposal type

Michael Niedermayer git at videolan.org
Mon May 13 00:52:34 CEST 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue May  7 16:07:27 2013 +0200| [a4681d1043556718fb20c9026f8d1cec4e7f453f] | committer: Michael Niedermayer

gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit d23b8462b5a4a9da78ed45c4a7a3b35d538df909)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 7ee5e97c46e30fb3d6f9f78cc3313dbc06528b37)

Conflicts:

	libavcodec/gifdec.c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/gifdec.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index a916dfe..9be5bec 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -471,6 +471,7 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A
     }
 
     if (s->keyframe) {
+        s->gce_prev_disposal = GCE_DISPOSAL_NONE;
         if ((ret = gif_read_header1(s)) < 0)
             return ret;
 



More information about the ffmpeg-cvslog mailing list