diff mbox

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

Message ID 20190601151656.8748-1-michael@niedermayer.cc
State Accepted
Commit e5f92f3fbadb29e54ac3ab82cd24d78e95bc286d
Headers show

Commit Message

Michael Niedermayer June 1, 2019, 3:16 p.m. UTC 
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@niedermayer.cc>
---
 libavcodec/v4l2_m2m_dec.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer June 12, 2019, 7:38 a.m. UTC | #1 
On Sat, Jun 01, 2019 at 05:16:56PM +0200, Michael Niedermayer wrote:
> 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@niedermayer.cc>
> ---
>  libavcodec/v4l2_m2m_dec.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply

[...]
diff mbox

Patch

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;
     }