[FFmpeg-cvslog] avcodec/hevc: Check max ctb addresses for WPP

[Michael Niedermayer]

ffmpeg | branch: release/2.5 | Michael Niedermayer <michael at niedermayer.cc> | Sat Nov 28 13:42:05 2015 +0100| [f0ae57aca4c9e72be050d8d2c100580094ada75f] | committer: Michael Niedermayer

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 at niedermayer.cc>
(cherry picked from commit dad354f38ddc9bfc834bc21358a1d0ad41532ca0)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

Conflicts:

	libavcodec/hevc.c

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0ae57aca4c9e72be050d8d2c100580094ada75f
---

 libavcodec/hevc.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index ae47ba0..5735e68 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]) {