diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 20:15:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 20:28:52 +0200 |
| commit | 24a5cd720d579634ab7140f4cb7fa09fe4b780e4 (patch) | |
| tree | ab6daae1ab822059338ee58cf8f754d375c42b57 | |
| parent | 75f5fe165cedc63ea89514b3e9f6da67fd1038ec (diff) | |
| download | ffmpeg-24a5cd720d579634ab7140f4cb7fa09fe4b780e4.tar.gz | |
avcodec/gifdec: factorize interleave end handling out
also change it to a loop
Fixes out of array access
Fixes: asan_heap-oob_ca5410_8_asan_heap-oob_ca5410_97_ID_LSD_Size_Less_Then_Data_Inter_3.gif
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8f1457864be8fb9653643519dea1c6492f1dde57)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 727887ab44..a27dee7865 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -253,26 +253,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; } |