| Message ID | AM7PR03MB6660976166FB529B6C9E45CF8F2D9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 10e520f1f147a4284c3d8d61109da12901281590 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/pngdec: Cleanup generically on init failure | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > I did not add these codecs the last time I searched for codecs > to add the FF_CODEC_CAP_INIT_CLEANUP because I was unsure whether > calling ff_thread_release_buffer() on a NULL frame was safe > (it is). > > libavcodec/pngdec.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > index 3c00007907..6a22f8d9d8 100644 > --- a/libavcodec/pngdec.c > +++ b/libavcodec/pngdec.c > @@ -1696,11 +1696,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); > > @@ -1741,7 +1738,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 > @@ -1759,6 +1756,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 Will apply this later today unless there are objections. - Andreas
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 3c00007907..6a22f8d9d8 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1696,11 +1696,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); @@ -1741,7 +1738,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 @@ -1759,6 +1756,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
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- I did not add these codecs the last time I searched for codecs to add the FF_CODEC_CAP_INIT_CLEANUP because I was unsure whether calling ff_thread_release_buffer() on a NULL frame was safe (it is). libavcodec/pngdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)