diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-26 20:28:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-16 16:00:22 +0200 |
| commit | a0366ef7e74f32f72d4611019fefd14076f4b5bc (patch) | |
| tree | c2e53adc1a20222c2b1502f459bcfc9517ae7d82 | |
| parent | 0456e2f3e0503082a5966a2cfb84da19a5b12cf5 (diff) | |
| download | ffmpeg-a0366ef7e74f32f72d4611019fefd14076f4b5bc.tar.gz | |
avcodec/pictordec: Check plane value before doing value/mask computations
Fixes integer overflow
Fixes: 675/clusterfuzz-testcase-6722971232108544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 63e400a8807dca7b0ffa3841df2e31f7419abb8d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pictordec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index a3d72e3f25..a09ee379c0 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -77,10 +77,10 @@ static void picmemset(PicContext *s, AVFrame *frame, int value, int run, if (*y < 0) { *y = s->height - 1; *plane += 1; - value <<= bits_per_plane; - mask <<= bits_per_plane; if (*plane >= s->nb_planes) return; + value <<= bits_per_plane; + mask <<= bits_per_plane; } } } |