[FFmpeg-cvslog] avcodec/hevc: Fix integer overflow of entry_point_offset
ffmpeg | branch: release/2.6 | Michael Niedermayer |
Sat Dec 5 22:08:59 2015 +0100| [929fd61602710211ccfd3c7fd8093fb6b032ad86] |
committer: Michael Niedermayer
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
(cherry picked from commit 214085852491448631dcecb008b5d172c11b8892)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=929fd61602710211ccfd3c7fd8093fb6b032ad86
---
libavcodec/hevc.c |4 ++--
libavcodec/hevc.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 66ebf3d..a8643d0 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -716,7 +716,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) {
@@ -2421,7 +2421,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 *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) {
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 22d6989..9e183b7 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -609,7 +609,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
-int *entry_point_offset;
+unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Fix integer overflow of entry_point_offset
ffmpeg | branch: release/2.7 | Michael Niedermayer |
Sat Dec 5 22:08:59 2015 +0100| [5af5396970b7cbaf22bd8754257f9bf9ffb36297] |
committer: Michael Niedermayer
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
(cherry picked from commit 214085852491448631dcecb008b5d172c11b8892)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5af5396970b7cbaf22bd8754257f9bf9ffb36297
---
libavcodec/hevc.c |4 ++--
libavcodec/hevc.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index b52a6d1..c520878 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -730,7 +730,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) {
@@ -2427,7 +2427,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 *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) {
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 2b47de2..96fc258 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -609,7 +609,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
-int *entry_point_offset;
+unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Fix integer overflow of entry_point_offset
ffmpeg | branch: release/2.4 | Michael Niedermayer |
Sat Dec 5 22:08:59 2015 +0100| [bafd5c3c80a4a9ee8f5c0e67320c6e0bf3869101] |
committer: Michael Niedermayer
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
(cherry picked from commit 214085852491448631dcecb008b5d172c11b8892)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bafd5c3c80a4a9ee8f5c0e67320c6e0bf3869101
---
libavcodec/hevc.c |4 ++--
libavcodec/hevc.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 5c530b7..85a0db8 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -696,7 +696,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) {
@@ -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 *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;
ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1);
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 7efafe1..c71ab550 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -607,7 +607,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
-int *entry_point_offset;
+unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Fix integer overflow of entry_point_offset
ffmpeg | branch: release/2.8 | Michael Niedermayer |
Sat Dec 5 22:08:59 2015 +0100| [10fc3d690c8b6c326e3fb11694e17519e4226722] |
committer: Michael Niedermayer
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
(cherry picked from commit 214085852491448631dcecb008b5d172c11b8892)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10fc3d690c8b6c326e3fb11694e17519e4226722
---
libavcodec/hevc.c |4 ++--
libavcodec/hevc.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 1f9069b..5f77761 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) {
@@ -2441,7 +2441,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) {
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 66b9a2f..d84e661 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -622,7 +622,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
-int *entry_point_offset;
+unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Fix integer overflow of entry_point_offset
ffmpeg | branch: release/2.5 | Michael Niedermayer |
Sat Dec 5 22:08:59 2015 +0100| [5c0be549efc2fcf13a2ebcb86920841958a6c445] |
committer: Michael Niedermayer
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
(cherry picked from commit 214085852491448631dcecb008b5d172c11b8892)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c0be549efc2fcf13a2ebcb86920841958a6c445
---
libavcodec/hevc.c |4 ++--
libavcodec/hevc.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 54f0acc..ae47ba0 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -696,7 +696,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) {
@@ -2392,7 +2392,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 *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;
ff_alloc_entries(s->avctx, s->sh.num_entry_point_offsets + 1);
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 564e66e..40beb52 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -607,7 +607,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
-int *entry_point_offset;
+unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Fix integer overflow of entry_point_offset
ffmpeg | branch: master | Michael Niedermayer | Sat
Dec 5 22:08:59 2015 +0100| [214085852491448631dcecb008b5d172c11b8892] |
committer: Michael Niedermayer
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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=214085852491448631dcecb008b5d172c11b8892
---
libavcodec/hevc.c |4 ++--
libavcodec/hevc.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 8333419..21435da 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) {
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 6d8f703..9d72555 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -622,7 +622,7 @@ typedef struct SliceHeader {
unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand
-int *entry_point_offset;
+unsigned *entry_point_offset;
int * offset;
int * size;
int num_entry_point_offsets;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
