[FFmpeg-cvslog] avcodec/h264_metadata: fix memory leak in case of output packet creation failure

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 20 00:55:26 2018 -0300| [039be6a23f4399a6a020a03be68e4c7cd5aaed2b] | committer: James Almer

avcodec/h264_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=039be6a23f4399a6a020a03be68e4c7cd5aaed2b
---

 libavcodec/h264_metadata_bsf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c
index e1f0c43b71..27053dbdcf 100644
--- a/libavcodec/h264_metadata_bsf.c
+++ b/libavcodec/h264_metadata_bsf.c
@@ -225,7 +225,7 @@ static int h264_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) {
@@ -545,6 +545,8 @@ fail:
     ff_cbs_fragment_uninit(ctx->cbc, au);
     av_freep(&displaymatrix_side_data);
 
+    if (err < 0)
+        av_packet_unref(out);
     av_packet_free(&in);
 
     return err;