diff mbox series

[FFmpeg-devel,34/40] avcodec/ac3enc_template: Don't free uninitialized pointers on error

Message ID 20200914052747.124118-18-andreas.rheinhardt@gmail.com
State Accepted
Commit ae36fad624307dcd1bbe0c954a017293a1ce34d3
Headers show
Series [FFmpeg-devel,01/16] avcodec/snowdec: Use ff_snow_common_init() directly | expand


Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 14, 2020, 5:27 a.m. UTC
The ac3 encoders (fixed- and floating-point AC-3 as well as the EAC-3
encoder) all allocate an array whose elements are pointers to other
buffers. The array is not zeroed initially so that if an allocation of
one of the subbuffers fails, the other pointers are uninitialized.
This causes problems when cleaning, so zero the array initially.

(Only the fixed-point AC-3 encoder was affected by this, because
the other two don't clean up at all in case of errors during init.)

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 libavcodec/ac3enc_template.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series


diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
index 985b35e5b6..b85fe51ef5 100644
--- a/libavcodec/ac3enc_template.c
+++ b/libavcodec/ac3enc_template.c
@@ -42,7 +42,7 @@  int AC3_NAME(allocate_sample_buffers)(AC3EncodeContext *s)
     int ch;
     if (!FF_ALLOC_TYPED_ARRAY(s->windowed_samples, AC3_WINDOW_SIZE) ||
-        !FF_ALLOC_TYPED_ARRAY(s->planar_samples,   s->channels))
+        !FF_ALLOCZ_TYPED_ARRAY(s->planar_samples,  s->channels))
         return AVERROR(ENOMEM);
     for (ch = 0; ch < s->channels; ch++) {