diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 20:15:52 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-12-20 11:11:42 +0100 |
| commit | 02de44073a8e116ea177b53081219d32ef135ad8 (patch) | |
| tree | 3236b503a90f440e4354d6938ae65907f64425d5 | |
| parent | 03dba25a4001495226651068232b4c6b1e75fd02 (diff) | |
| download | ffmpeg-02de44073a8e116ea177b53081219d32ef135ad8.tar.gz | |
gifdec: refactor interleave end handling
Fixes invalid writes with very small image heights.
CC: libav-stable@libav.org
Bug-ID: CVE-2014-8547
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 0b39ac6f54505a538c21fe49a626de94c518c903)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit eac49477aa95cf727d87d2741ee8e60be59d394b)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 92888e9ed4ea4e761ae953bbe28c85cc658abc8f)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/gifdec.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 99c24d50ab..5297ed6ea7 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -128,26 +128,21 @@ static int gif_read_image(GifState *s) case 1: y1 += 8; ptr += linesize * 8; - if (y1 >= height) { - y1 = pass ? 2 : 4; - ptr = ptr1 + linesize * y1; - pass++; - } break; case 2: y1 += 4; ptr += linesize * 4; - if (y1 >= height) { - y1 = 1; - ptr = ptr1 + linesize; - pass++; - } break; case 3: y1 += 2; ptr += linesize * 2; break; } + while (y1 >= height) { + y1 = 4 >> pass; + ptr = ptr1 + linesize * y1; + pass++; + } } else { ptr += linesize; } |