Re: [FFmpeg-devel] [PATCH 1/3] avcodec/h264_metadata: fix memory leak in case of output packet creation failure
On 3/20/2018 2:46 PM, James Almer wrote: > On 3/20/2018 12:55 AM, James Almer wrote: >> Some function calls may fail after the output packet is initialized. >> >> Signed-off-by: James Almer >> --- >> libavcodec/h264_metadata_bsf.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c >> index e1f0c43b71..0381e9d102 100644 >> --- a/libavcodec/h264_metadata_bsf.c >> +++ b/libavcodec/h264_metadata_bsf.c >> @@ -545,6 +545,8 @@ fail: >> ff_cbs_fragment_uninit(ctx->cbc, au); >> av_freep(&displaymatrix_side_data); >> >> +if (err < 0) >> +av_packet_unref(&out); > > Err, it's meant to be out, not &out. > > Fixed locally on all three patches. > >> av_packet_free(&in); >> >> return err; >> Set approved by jkqxz on IRC and pushed. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 1/3] avcodec/h264_metadata: fix memory leak in case of output packet creation failure
On 3/20/2018 12:55 AM, James Almer wrote: > Some function calls may fail after the output packet is initialized. > > Signed-off-by: James Almer > --- > libavcodec/h264_metadata_bsf.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c > index e1f0c43b71..0381e9d102 100644 > --- a/libavcodec/h264_metadata_bsf.c > +++ b/libavcodec/h264_metadata_bsf.c > @@ -545,6 +545,8 @@ fail: > ff_cbs_fragment_uninit(ctx->cbc, au); > av_freep(&displaymatrix_side_data); > > +if (err < 0) > +av_packet_unref(&out); Err, it's meant to be out, not &out. Fixed locally on all three patches. > av_packet_free(&in); > > return err; > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 1/3] avcodec/h264_metadata: fix memory leak in case of output packet creation failure
Some function calls may fail after the output packet is initialized. Signed-off-by: James Almer --- libavcodec/h264_metadata_bsf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index e1f0c43b71..0381e9d102 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -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; -- 2.16.2 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
