ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Feb 11 22:50:57 2018 -0300| [0a320f7e7a9bf8e6e9e9c33adfdb5bea743bfd52] | committer: James Almer
Merge commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935' * commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935': hwcontext: Fix memory leak on derived frame allocation failure Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a320f7e7a9bf8e6e9e9c33adfdb5bea743bfd52 --- libavutil/hwcontext.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 31ac12807b..70c556ecac 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -483,8 +483,10 @@ int av_hwframe_get_buffer(AVBufferRef *hwframe_ref, AVFrame *frame, int flags) ret = av_hwframe_get_buffer(ctx->internal->source_frames, src_frame, 0); - if (ret < 0) + if (ret < 0) { + av_frame_free(&src_frame); return ret; + } ret = av_hwframe_map(frame, src_frame, ctx->internal->source_allocation_map_flags); ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog