diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-24 14:46:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-24 22:17:15 +0200 |
| commit | 933aa91e31d5cbf9dbc0cf416a988e6011bc4a40 (patch) | |
| tree | 6953e13b3c8779f7e7c7859b28e6e00f48860959 /libavcodec/hevc_cabac.c | |
| parent | c1b43e8452e778edea757e912d17780df1ebd92d (diff) | |
| download | ffmpeg-933aa91e31d5cbf9dbc0cf416a988e6011bc4a40.tar.gz | |
avcodec/hevcdec: check ff_init_cabac_decoder() for failure
Fixes: runtime error: left shift of 1965559808 by 4 places cannot be represented in type 'int'
Fixes: 2333/clusterfuzz-testcase-minimized-5223935677300736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hevc_cabac.c')
| -rw-r--r-- | libavcodec/hevc_cabac.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 3fe228d249..4c14e77bcd 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -467,12 +467,12 @@ static void cabac_reinit(HEVCLocalContext *lc) skip_bytes(&lc->cc, 0); } -static void cabac_init_decoder(HEVCContext *s) +static int cabac_init_decoder(HEVCContext *s) { GetBitContext *gb = &s->HEVClc->gb; skip_bits(gb, 1); align_get_bits(gb); - ff_init_cabac_decoder(&s->HEVClc->cc, + return ff_init_cabac_decoder(&s->HEVClc->cc, gb->buffer + get_bits_count(gb) / 8, (get_bits_left(gb) + 7) / 8); } @@ -501,10 +501,12 @@ static void cabac_init_state(HEVCContext *s) s->HEVClc->stat_coeff[i] = 0; } -void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) +int ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) { if (ctb_addr_ts == s->ps.pps->ctb_addr_rs_to_ts[s->sh.slice_ctb_addr_rs]) { - cabac_init_decoder(s); + int ret = cabac_init_decoder(s); + if (ret < 0) + return ret; if (s->sh.dependent_slice_segment_flag == 0 || (s->ps.pps->tiles_enabled_flag && s->ps.pps->tile_id[ctb_addr_ts] != s->ps.pps->tile_id[ctb_addr_ts - 1])) @@ -524,8 +526,11 @@ void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) s->ps.pps->tile_id[ctb_addr_ts] != s->ps.pps->tile_id[ctb_addr_ts - 1]) { if (s->threads_number == 1) cabac_reinit(s->HEVClc); - else - cabac_init_decoder(s); + else { + int ret = cabac_init_decoder(s); + if (ret < 0) + return ret; + } cabac_init_state(s); } if (s->ps.pps->entropy_coding_sync_enabled_flag) { @@ -533,8 +538,11 @@ void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) get_cabac_terminate(&s->HEVClc->cc); if (s->threads_number == 1) cabac_reinit(s->HEVClc); - else - cabac_init_decoder(s); + else { + int ret = cabac_init_decoder(s); + if (ret < 0) + return ret; + } if (s->ps.sps->ctb_width == 1) cabac_init_state(s); @@ -543,6 +551,7 @@ void ff_hevc_cabac_init(HEVCContext *s, int ctb_addr_ts) } } } + return 0; } #define GET_CABAC(ctx) get_cabac(&s->HEVClc->cc, &s->HEVClc->cabac_state[ctx]) |