Browse Source

avcodec/ac3enc_float, eac3enc: Fix leaks on init error

The AC-3 encoders (both floating- as well as fixed-point) as well as
the EAC-3 encoder share code: All use ff_ac3_encode_init() as well as
ff_ac3_encode_close(). Until ee726e777b
ff_ac3_encode_init() called ff_ac3_encode_close() to clean up on error.
Said commit removed this and instead set the FF_CODEC_CAP_INIT_CLEANUP
flag; but it did the latter only for the fixed-point AC-3 encoder and
not for the other two users of ff_ac3_encode_init(). This caused any
already allocated buffer to leak upon a subsequent error for the two
other encoders.

This commit fixes this by adding the FF_CODEC_CAP_INIT_CLEANUP flag
to the other two encoders using ff_ac3_encode_init().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
tags/n4.4
Andreas Rheinhardt 5 years ago
parent
commit
f4e6aa609d
2 changed files with 2 additions and 0 deletions
  1. +1
    -0
      libavcodec/ac3enc_float.c
  2. +1
    -0
      libavcodec/eac3enc.c

+ 1
- 0
libavcodec/ac3enc_float.c View File

@@ -153,4 +153,5 @@ AVCodec ff_ac3_encoder = {
.supported_samplerates = ff_ac3_sample_rate_tab,
.channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};

+ 1
- 0
libavcodec/eac3enc.c View File

@@ -266,4 +266,5 @@ AVCodec ff_eac3_encoder = {
.supported_samplerates = ff_ac3_sample_rate_tab,
.channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};

Loading…
Cancel
Save