diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-27 23:33:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-05 23:48:52 +0100 |
| commit | d8c0546ecdb0514cbc44a4ec656563710dd8b25a (patch) | |
| tree | b8bd04405aef706904787ed2a1814ace49363e16 | |
| parent | f9d6d02fd1d6ea4e98d7f115232d797e68096fb4 (diff) | |
| download | ffmpeg-d8c0546ecdb0514cbc44a4ec656563710dd8b25a.tar.gz | |
avcodec/hevc: allocate entries unconditionally
Fixes out of array access
Fixes: 08664a2a7921ef48172f26495c7455be/asan_heap-oob_23036c6_3301_523388ef84285a0270caf67a43247b59.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Conflicts:
libavcodec/hevc.c
| -rw-r--r-- | libavcodec/hevc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 5bba4bb8c1..54f0accb60 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2395,11 +2395,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const uint8_t *nal, int length) int startheader, cmpt = 0; int i, j, res = 0; + ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); if (!s->sList[1]) { - ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); - - for (i = 1; i < s->threads_number; i++) { s->sList[i] = av_malloc(sizeof(HEVCContext)); memcpy(s->sList[i], s, sizeof(HEVCContext)); |