ffmpeg | branch: release/2.5 | Michael Niedermayer <mich...@niedermayer.cc> |
Fri Nov 27 23:33:03 2015 +0100| [d8c0546ecdb0514cbc44a4ec656563710dd8b25a] |
committer: Michael Niedermayer
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 <mich...@niedermayer.cc>
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
Conflicts:
libavcodec/hevc.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8c0546ecdb0514cbc44a4ec656563710dd8b25a
---
libavcodec/hevc.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 5bba4bb..54f0acc 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));
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
