diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-27 23:33:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-27 23:37:42 +0100 |
| commit | d85aa76115214183e7e3b7d65e950da61474959a (patch) | |
| tree | 0cad933002e4a98514c549748759fd7ec85574a6 /libavcodec | |
| parent | 36205501ba2f003c6b319a6d20e39fe991ee7511 (diff) | |
| download | ffmpeg-d85aa76115214183e7e3b7d65e950da61474959a.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>
Diffstat (limited to 'libavcodec')
| -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 e9f27a4bea..6edfcdf9bc 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2452,11 +2452,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const HEVCNAL *nal) return AVERROR(ENOMEM); } + 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)); |