diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-24 23:54:17 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-27 07:20:58 +0100 |
| commit | 39d6d7f7e882f385d5b6e0dfe1acf9447ec467f1 (patch) | |
| tree | 20db1c1db08c8be2ff75f9e1102566115385f748 | |
| parent | 3fe22f2a0d76301de4567cdbade66c1992a57509 (diff) | |
| download | ffmpeg-39d6d7f7e882f385d5b6e0dfe1acf9447ec467f1.tar.gz | |
avcodec/utils: Don't forget cleaning up when allocating priv_data fails
Allocating an AVCodecContext's priv_data used to be the first object
allocated in avcodec_open2(), so it was unnecessary to goto free_and_end
(which does the cleanup) upon error here. But this is no longer so since
f3a29b750a5979ae6847879fba758faf1fae88d0.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit d1dcc20126f3df52762bf5972a282d1699ef1ca8)
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e19670b7c8..0f589b6929 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -610,7 +610,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->priv_data = av_mallocz(codec->priv_data_size); if (!avctx->priv_data) { ret = AVERROR(ENOMEM); - goto end; + goto free_and_end; } if (codec->priv_class) { *(const AVClass **)avctx->priv_data = codec->priv_class; |