diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-20 19:21:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-20 19:36:01 +0200 |
| commit | a31e08fa1aa5c5f0518b8af850f28eb945268e66 (patch) | |
| tree | aa1752e6c4e13ab5f7bfbc9b74ba1706eeb81538 /libavcodec | |
| parent | 27ee70290ef4c032bff5c1dd7c0db2f6d17018fe (diff) | |
| download | ffmpeg-a31e08fa1aa5c5f0518b8af850f28eb945268e66.tar.gz | |
avcodec/diracdec: Check numx/y
Fixes division by 0
Fixes: 60261c4469ba3e11059890fb2832a515/asan_generic_135e694_2790_beb94eaa0aeb7d11c0437375a8964a99.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/diracdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 6cb098b08c..b183fad584 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1225,6 +1225,11 @@ static int dirac_unpack_idwt_params(DiracContext *s) else { s->num_x = get_interleaved_ue_golomb(gb); s->num_y = get_interleaved_ue_golomb(gb); + if (s->num_x * s->num_y == 0 || s->num_x * (uint64_t)s->num_y > INT_MAX) { + av_log(s->avctx,AV_LOG_ERROR,"Invalid numx/y\n"); + s->num_x = s->num_y = 0; + return AVERROR_INVALIDDATA; + } if (s->ld_picture) { s->lowdelay.bytes.num = get_interleaved_ue_golomb(gb); s->lowdelay.bytes.den = get_interleaved_ue_golomb(gb); |