diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-08 11:03:52 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-11 06:52:12 +0100 |
| commit | 10e520f1f147a4284c3d8d61109da12901281590 (patch) | |
| tree | 318361bb2132ddf844ea2bb5a6f65c1b7df13087 /libavcodec/pngdec.c | |
| parent | c4d63dbc9417ddf77f6e33f6144b23da7e97cb3b (diff) | |
avcodec/pngdec: Cleanup generically on init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/pngdec.c')
| -rw-r--r-- | libavcodec/pngdec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 7571def907..39bb652f67 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1698,11 +1698,8 @@ static av_cold int png_dec_init(AVCodecContext *avctx) s->avctx = avctx; s->last_picture.f = av_frame_alloc(); s->picture.f = av_frame_alloc(); - if (!s->last_picture.f || !s->picture.f) { - av_frame_free(&s->last_picture.f); - av_frame_free(&s->picture.f); + if (!s->last_picture.f || !s->picture.f) return AVERROR(ENOMEM); - } ff_pngdsp_init(&s->dsp); @@ -1743,7 +1740,7 @@ const AVCodec ff_apng_decoder = { .decode = decode_frame_apng, .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_ALLOCATE_PROGRESS, }; #endif @@ -1761,6 +1758,6 @@ const AVCodec ff_png_decoder = { .update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context), .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, }; #endif |