[FFmpeg-cvslog] avcodec/alac: Clear pointers in allocate_buffers()
ffmpeg | branch: release/2.4 | Michael Niedermayer mich...@niedermayer.cc |
Mon Jul 13 15:46:10 2015 +0200| [41fba53525f70827764716d55ba66585d604523e] |
committer: Michael Niedermayer
avcodec/alac: Clear pointers in allocate_buffers()
Fixes:
06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
(cherry picked from commit f7068bf277a37479aecde2832208d820682b35e6)
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41fba53525f70827764716d55ba66585d604523e
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 604774a..f018101 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -534,6 +534,12 @@ static int allocate_buffers(ALACContext *alac)
int ch;
int buf_size = alac-max_samples_per_frame * sizeof(int32_t);
+for (ch = 0; ch 2; ch++) {
+alac-predict_error_buffer[ch] = NULL;
+alac-output_samples_buffer[ch] = NULL;
+alac-extra_bits_buffer[ch] = NULL;
+}
+
for (ch = 0; ch FFMIN(alac-channels, 2); ch++) {
FF_ALLOC_OR_GOTO(alac-avctx, alac-predict_error_buffer[ch],
buf_size, buf_alloc_fail);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/alac: Clear pointers in allocate_buffers()
ffmpeg | branch: release/2.5 | Michael Niedermayer mich...@niedermayer.cc |
Mon Jul 13 15:46:10 2015 +0200| [3489693051a7eaa43b219fc55286cb5e0c280902] |
committer: Michael Niedermayer
avcodec/alac: Clear pointers in allocate_buffers()
Fixes:
06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
(cherry picked from commit f7068bf277a37479aecde2832208d820682b35e6)
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3489693051a7eaa43b219fc55286cb5e0c280902
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index f5a5b86..48013f6 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -533,6 +533,12 @@ static int allocate_buffers(ALACContext *alac)
int ch;
int buf_size = alac-max_samples_per_frame * sizeof(int32_t);
+for (ch = 0; ch 2; ch++) {
+alac-predict_error_buffer[ch] = NULL;
+alac-output_samples_buffer[ch] = NULL;
+alac-extra_bits_buffer[ch] = NULL;
+}
+
for (ch = 0; ch FFMIN(alac-channels, 2); ch++) {
FF_ALLOC_OR_GOTO(alac-avctx, alac-predict_error_buffer[ch],
buf_size, buf_alloc_fail);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/alac: Clear pointers in allocate_buffers()
ffmpeg | branch: release/2.6 | Michael Niedermayer mich...@niedermayer.cc |
Mon Jul 13 15:46:10 2015 +0200| [0cb600b7bfb7ea1cc333cabce7d5c02a68bb15cb] |
committer: Michael Niedermayer
avcodec/alac: Clear pointers in allocate_buffers()
Fixes:
06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
(cherry picked from commit f7068bf277a37479aecde2832208d820682b35e6)
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cb600b7bfb7ea1cc333cabce7d5c02a68bb15cb
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index ada7c73..d7aa7fb 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -533,6 +533,12 @@ static int allocate_buffers(ALACContext *alac)
int ch;
int buf_size = alac-max_samples_per_frame * sizeof(int32_t);
+for (ch = 0; ch 2; ch++) {
+alac-predict_error_buffer[ch] = NULL;
+alac-output_samples_buffer[ch] = NULL;
+alac-extra_bits_buffer[ch] = NULL;
+}
+
for (ch = 0; ch FFMIN(alac-channels, 2); ch++) {
FF_ALLOC_OR_GOTO(alac-avctx, alac-predict_error_buffer[ch],
buf_size, buf_alloc_fail);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/alac: Clear pointers in allocate_buffers()
ffmpeg | branch: release/2.7 | Michael Niedermayer mich...@niedermayer.cc |
Mon Jul 13 15:46:10 2015 +0200| [264eb0074f3b0591c9430b20927d6547c8757c48] |
committer: Michael Niedermayer
avcodec/alac: Clear pointers in allocate_buffers()
Fixes:
06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
(cherry picked from commit f7068bf277a37479aecde2832208d820682b35e6)
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=264eb0074f3b0591c9430b20927d6547c8757c48
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index b0527f1..a5948bb 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -534,6 +534,12 @@ static int allocate_buffers(ALACContext *alac)
int ch;
int buf_size = alac-max_samples_per_frame * sizeof(int32_t);
+for (ch = 0; ch 2; ch++) {
+alac-predict_error_buffer[ch] = NULL;
+alac-output_samples_buffer[ch] = NULL;
+alac-extra_bits_buffer[ch] = NULL;
+}
+
for (ch = 0; ch FFMIN(alac-channels, 2); ch++) {
FF_ALLOC_OR_GOTO(alac-avctx, alac-predict_error_buffer[ch],
buf_size, buf_alloc_fail);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/alac: Clear pointers in allocate_buffers()
ffmpeg | branch: master | Michael Niedermayer mich...@niedermayer.cc | Mon
Jul 13 15:46:10 2015 +0200| [f7068bf277a37479aecde2832208d820682b35e6] |
committer: Michael Niedermayer
avcodec/alac: Clear pointers in allocate_buffers()
Fixes:
06a4edb39ad8a9883175f9bd428334a2_signal_sigsegv_7713351a_706_mov__alac__ALAC_6ch.mov
Found-by: Samuel Groß, Mateusz j00ru Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer mich...@niedermayer.cc
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7068bf277a37479aecde2832208d820682b35e6
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index b0527f1..a5948bb 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -534,6 +534,12 @@ static int allocate_buffers(ALACContext *alac)
int ch;
int buf_size = alac-max_samples_per_frame * sizeof(int32_t);
+for (ch = 0; ch 2; ch++) {
+alac-predict_error_buffer[ch] = NULL;
+alac-output_samples_buffer[ch] = NULL;
+alac-extra_bits_buffer[ch] = NULL;
+}
+
for (ch = 0; ch FFMIN(alac-channels, 2); ch++) {
FF_ALLOC_OR_GOTO(alac-avctx, alac-predict_error_buffer[ch],
buf_size, buf_alloc_fail);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
