diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-05-06 16:56:19 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-05-12 06:00:13 +0200 |
| commit | fcdb012a100b245890949b2d53cb7f042380787d (patch) | |
| tree | 986a44635b3bbbd5d5f7720ed31e4479d41300ed | |
| parent | 0bc522a0a1c83894fbf7975e17de19ca34a02ae0 (diff) | |
| download | ffmpeg-fcdb012a100b245890949b2d53cb7f042380787d.tar.gz | |
avcodec/wma(dec|enc): Fix memleaks upon allocation error
ff_wma_init() can fail without freeing everything it has allocated;
so add the FF_CODEC_CAP_INIT_CLEANUP to the codecs using it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/wmadec.c | 2 | ||||
| -rw-r--r-- | libavcodec/wmaenc.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 9081f35a16..b63ce66b23 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -977,6 +977,7 @@ const AVCodec ff_wmav1_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_DECODER @@ -993,5 +994,6 @@ const AVCodec ff_wmav2_decoder = { .capabilities = AV_CODEC_CAP_DR1, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 89273ba978..2a78325298 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -436,6 +436,7 @@ const AVCodec ff_wmav1_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif #if CONFIG_WMAV2_ENCODER @@ -450,5 +451,6 @@ const AVCodec ff_wmav2_encoder = { .close = ff_wma_end, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif |