diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 13:42:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 02:16:35 +0100 |
| commit | f0ae57aca4c9e72be050d8d2c100580094ada75f (patch) | |
| tree | c0b83e1bb191f1c417f38b59331313b23bdd8748 | |
| parent | 4a91e424dae80c2ca63e616a65259ad039af4a9a (diff) | |
| download | ffmpeg-f0ae57aca4c9e72be050d8d2c100580094ada75f.tar.gz | |
avcodec/hevc: Check max ctb addresses for WPP
Fixes out of array read
Fixes: 2f95ddd996db8a6281d2e18c184595a7/asan_heap-oob_192fe91_3330_58e4441181e30a66c19f743dcb392347.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit dad354f38ddc9bfc834bc21358a1d0ad41532ca0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Conflicts:
libavcodec/hevc.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/hevc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index ae47ba0c55..5735e68351 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2395,6 +2395,15 @@ static int hls_slice_data_wpp(HEVCContext *s, const uint8_t *nal, int length) int64_t startheader, cmpt = 0; int i, j, res = 0; + if (s->sh.slice_ctb_addr_rs + s->sh.num_entry_point_offsets * s->sps->ctb_width >= s->sps->ctb_width * s->sps->ctb_height) { + av_log(s->avctx, AV_LOG_ERROR, "WPP ctb addresses are wrong (%d %d %d %d)\n", + s->sh.slice_ctb_addr_rs, s->sh.num_entry_point_offsets, + s->sps->ctb_width, s->sps->ctb_height + ); + res = AVERROR_INVALIDDATA; + goto error; + } + ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); if (!s->sList[1]) { |