diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 16:07:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-13 00:46:27 +0200 |
| commit | a4681d1043556718fb20c9026f8d1cec4e7f453f (patch) | |
| tree | 158ff4e9c25a11d7c22cec39519dcd4bcc699760 | |
| parent | 151c2ca8c797a00927776bb77427dc0c77e641d2 (diff) | |
| download | ffmpeg-a4681d1043556718fb20c9026f8d1cec4e7f453f.tar.gz | |
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@gmx.at>
(cherry picked from commit d23b8462b5a4a9da78ed45c4a7a3b35d538df909)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7ee5e97c46e30fb3d6f9f78cc3313dbc06528b37)
Conflicts:
libavcodec/gifdec.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/gifdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index a916dfe8e7..9be5bec003 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; |