diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 13:42:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 15:48:55 +0100 |
| commit | dad354f38ddc9bfc834bc21358a1d0ad41532ca0 (patch) | |
| tree | 6588dcb2140877cc9d35f16ef8f1b1c6747ed1ce /libavcodec/hevc.c | |
| parent | 79abf2d0ded860acf505de22c4f7a750e5e98446 (diff) | |
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>
Diffstat (limited to 'libavcodec/hevc.c')
| -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 6edfcdf9bc..fa75729291 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2452,6 +2452,15 @@ static int hls_slice_data_wpp(HEVCContext *s, const HEVCNAL *nal) return AVERROR(ENOMEM); } + if (s->sh.slice_ctb_addr_rs + s->sh.num_entry_point_offsets * s->ps.sps->ctb_width >= s->ps.sps->ctb_width * s->ps.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->ps.sps->ctb_width, s->ps.sps->ctb_height + ); + res = AVERROR_INVALIDDATA; + goto error; + } + ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); if (!s->sList[1]) { |