RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/hevc: Fix integer overflow of entry_point_offset 

Fixes out of array read
Fixes: d41d8cd98f00b204e9800998ecf8427e/signal_sigsegv_321165b_7641_077dfcd8cbc80b1c0b470c8554cd6ffb.bit

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2140858524)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-12-05 22:08:59 +01:00
parent 9459490c2a
commit bafd5c3c80
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hevc.c
View File

@ -696,7 +696,7 @@ static int hls_slice_header(HEVCContext *s)
av_freep(&sh->entry_point_offset); av_freep(&sh->entry_point_offset);
av_freep(&sh->offset); av_freep(&sh->offset);
av_freep(&sh->size); av_freep(&sh->size);
sh->entry_point_offset = av_malloc_array(sh->num_entry_point_offsets, sizeof(int)); sh->entry_point_offset = av_malloc_array(sh->num_entry_point_offsets, sizeof(unsigned));
sh->offset = av_malloc_array(sh->num_entry_point_offsets, sizeof(int)); sh->offset = av_malloc_array(sh->num_entry_point_offsets, sizeof(int));
sh->size = av_malloc_array(sh->num_entry_point_offsets, sizeof(int)); sh->size = av_malloc_array(sh->num_entry_point_offsets, sizeof(int));
if (!sh->entry_point_offset || !sh->offset || !sh->size) { if (!sh->entry_point_offset || !sh->offset || !sh->size) {
@ -2410,7 +2410,7 @@ static int hls_slice_data_wpp(HEVCContext *s, const uint8_t *nal, int length)
int *ret = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int)); int *ret = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int));
int *arg = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int)); int *arg = av_malloc_array(s->sh.num_entry_point_offsets + 1, sizeof(int));
int64_t offset; int64_t offset;
int startheader, cmpt = 0; int64_t startheader, cmpt = 0;
int i, j, res = 0; int i, j, res = 0;
ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1); ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1);

2
libavcodec/hevc.h
View File

@ -607,7 +607,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
int *entry_point_offset; unsigned *entry_point_offset;
int * offset; int * offset;
int * size; int * size;
int num_entry_point_offsets; int num_entry_point_offsets;