[FFmpeg-cvslog] avcodec/hevc: allocate entries unconditionally
ffmpeg | branch: release/2.6 | Michael Niedermayer |
Fri Nov 27 23:33:03 2015 +0100| [c84ec8d5c93887c2a97c3da514848f5fbb5ba3e6] |
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
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c84ec8d5c93887c2a97c3da514848f5fbb5ba3e6
---
libavcodec/hevc.c |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index a2c602a..66ebf3d 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2430,11 +2430,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const
uint8_t *nal, int length)
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));
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: allocate entries unconditionally
ffmpeg | branch: release/2.7 | Michael Niedermayer |
Fri Nov 27 23:33:03 2015 +0100| [4fe6f9f6271c3e33ec9fddc3dbac17c0436c0f9a] |
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
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fe6f9f6271c3e33ec9fddc3dbac17c0436c0f9a
---
libavcodec/hevc.c |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 8e7e736..b52a6d1 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2436,11 +2436,9 @@ static int hls_slice_data_wpp(HEVCContext *s, const
uint8_t *nal, int length)
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));
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: allocate entries unconditionally
ffmpeg | branch: release/2.4 | Michael Niedermayer |
Fri Nov 27 23:33:03 2015 +0100| [02764f12a67129ec89c3de5a0b7b2edf1236bee2] |
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
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer
Conflicts:
libavcodec/hevc.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02764f12a67129ec89c3de5a0b7b2edf1236bee2
---
libavcodec/hevc.c |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 960573f..5c530b7 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2413,11 +2413,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
[FFmpeg-cvslog] avcodec/hevc: allocate entries unconditionally
ffmpeg | branch: release/2.8 | Michael Niedermayer |
Fri Nov 27 23:33:03 2015 +0100| [1cbc2cb5084e732d89a56792133576149040f693] |
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
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1cbc2cb5084e732d89a56792133576149040f693
---
libavcodec/hevc.c |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 8ee2abc..f7ede4d 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2450,11 +2450,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));
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: allocate entries unconditionally
ffmpeg | branch: release/2.5 | Michael Niedermayer |
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
(cherry picked from commit d85aa76115214183e7e3b7d65e950da61474959a)
Signed-off-by: Michael Niedermayer
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
[FFmpeg-cvslog] avcodec/hevc: allocate entries unconditionally
ffmpeg | branch: master | Michael Niedermayer | Fri
Nov 27 23:33:03 2015 +0100| [d85aa76115214183e7e3b7d65e950da61474959a] |
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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d85aa76115214183e7e3b7d65e950da61474959a
---
libavcodec/hevc.c |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index e9f27a4..6edfcdf 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));
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
