[FFmpeg-cvslog] avcodec/h265_metadata: fix memory leak in case of output packet creation failure
James Almer
git at videolan.org
Tue Mar 20 23:31:43 EET 2018
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 20 00:55:27 2018 -0300| [ae36d6cdde0799099dee0397427438bfc86bc1d9] | committer: James Almer
avcodec/h265_metadata: fix memory leak in case of output packet creation failure
Some function calls may fail after the output packet is initialized.
Reviewed-by: jkqxz
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae36d6cdde0799099dee0397427438bfc86bc1d9
---
libavcodec/h265_metadata_bsf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c
index 8759e410f3..26eb2d05d0 100644
--- a/libavcodec/h265_metadata_bsf.c
+++ b/libavcodec/h265_metadata_bsf.c
@@ -239,7 +239,7 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *out)
err = ff_bsf_get_packet(bsf, &in);
if (err < 0)
- goto fail;
+ return err;
err = ff_cbs_read_packet(ctx->cbc, au, in);
if (err < 0) {
@@ -324,6 +324,8 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *out)
fail:
ff_cbs_fragment_uninit(ctx->cbc, au);
+ if (err < 0)
+ av_packet_unref(out);
av_packet_free(&in);
return err;
More information about the ffmpeg-cvslog
mailing list