[FFmpeg-cvslog] avcodec/v4l2_m2m_dec: Fix memleak on ff_v4l2_m2m_codec_init() failure

Michael Niedermayer git at videolan.org
Wed Jun 12 13:04:40 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jun  1 16:44:46 2019 +0200| [e5f92f3fbadb29e54ac3ab82cd24d78e95bc286d] | committer: Michael Niedermayer

avcodec/v4l2_m2m_dec: Fix memleak on ff_v4l2_m2m_codec_init() failure

Fixes: 13579/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG1_V4L2M2M_fuzzer-5753560726241280

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5f92f3fbadb29e54ac3ab82cd24d78e95bc286d
---

 libavcodec/v4l2_m2m_dec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
index 710e40efd8..d0601f0e2f 100644
--- a/libavcodec/v4l2_m2m_dec.c
+++ b/libavcodec/v4l2_m2m_dec.c
@@ -188,7 +188,11 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx)
 
     ret = ff_v4l2_m2m_codec_init(avctx);
     if (ret) {
+        V4L2m2mPriv *priv = avctx->priv_data;
         av_log(avctx, AV_LOG_ERROR, "can't configure decoder\n");
+        s->self_ref = NULL;
+        av_buffer_unref(&priv->context_ref);
+
         return ret;
     }
 



More information about the ffmpeg-cvslog mailing list