diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-05 22:08:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-05 22:34:30 +0100 |
| commit | 214085852491448631dcecb008b5d172c11b8892 (patch) | |
| tree | 3b9c1146443f47a3a2474013251ce59a69f19c9b /libavcodec/hevc.c | |
| parent | dcbe8d8abc9b726650e36572f1f9dbd0879cbd93 (diff) | |
| download | ffmpeg-214085852491448631dcecb008b5d172c11b8892.tar.gz | |
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>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 8333419edd..21435da981 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -744,7 +744,7 @@ static int hls_slice_header(HEVCContext *s) av_freep(&sh->entry_point_offset); av_freep(&sh->offset); 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->size = av_malloc_array(sh->num_entry_point_offsets, sizeof(int)); if (!sh->entry_point_offset || !sh->offset || !sh->size) { @@ -2443,7 +2443,7 @@ static int hls_slice_data_wpp(HEVCContext *s, const HEVCNAL *nal) 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)); int64_t offset; - int startheader, cmpt = 0; + int64_t startheader, cmpt = 0; int i, j, res = 0; if (!ret || !arg) { |