diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-22 21:42:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-28 14:35:51 +0200 |
| commit | bed125b7108481574f36fdd6ee699b27354602e8 (patch) | |
| tree | f3d3be43d46078cb26f5939d1baf407b784246e7 /libavcodec/diracdec.c | |
| parent | f457c0ad7f73e31e99761f2ad3738cf3b3c24ca0 (diff) | |
| download | ffmpeg-bed125b7108481574f36fdd6ee699b27354602e8.tar.gz | |
avcodec/diracdec: Check bytes count in else branch in decode_lowdelay() too
Fixes: signed integer overflow: 8 * 340018243 cannot be represented in type 'int'
Fixes: 9441/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5194665207791616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/diracdec.c')
| -rw-r--r-- | libavcodec/diracdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index b27c743c58..9a417caec5 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -986,6 +986,10 @@ static int decode_lowdelay(DiracContext *s) for (slice_x = 0; bufsize > 0 && slice_x < s->num_x; slice_x++) { bytes = (slice_num+1) * (int64_t)s->lowdelay.bytes.num / s->lowdelay.bytes.den - slice_num * (int64_t)s->lowdelay.bytes.num / s->lowdelay.bytes.den; + if (bytes >= INT_MAX || bytes*8 > bufsize) { + av_log(s->avctx, AV_LOG_ERROR, "too many bytes\n"); + return AVERROR_INVALIDDATA; + } slices[slice_num].bytes = bytes; slices[slice_num].slice_x = slice_x; slices[slice_num].slice_y = slice_y; |