summaryrefslogtreecommitdiff
path: root/libavcodec/pictordec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-02-26 20:28:00 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-02-28 01:13:52 +0100
commit63e400a8807dca7b0ffa3841df2e31f7419abb8d (patch)
tree2f52cd0bcc2c85f719386557c16bd0c9209d447c /libavcodec/pictordec.c
parent25e93aacc2142f3b57f1e63c67ca46d304f154ef (diff)
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>
Diffstat (limited to 'libavcodec/pictordec.c')
-rw-r--r--libavcodec/pictordec.c4
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;
}
}
}