diff mbox

[FFmpeg-devel,2/4] avformat/img2dec: Fix probe_buffer leak in ff_img_read_header()

Message ID 20190612232020.25959-2-michael@niedermayer.cc
State Accepted
Commit bd3672ba75c7e4a4b0cb2b46b8b6c983d73a0107
Headers show

Commit Message

Michael Niedermayer June 12, 2019, 11:20 p.m. UTC 
Fixes: memleak
Fixes: 15171/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5683881644130304

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/img2dec.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Michael Niedermayer June 25, 2019, 9:02 a.m. UTC | #1 
On Thu, Jun 13, 2019 at 01:20:18AM +0200, Michael Niedermayer wrote:
> Fixes: memleak
> Fixes: 15171/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5683881644130304
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/img2dec.c | 1 +
>  1 file changed, 1 insertion(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index fe45c5e5ec..f8b4a655a5 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -356,6 +356,7 @@  int ff_img_read_header(AVFormatContext *s1)
             }
             if (s1->flags & AVFMT_FLAG_CUSTOM_IO) {
                 avio_seek(s1->pb, 0, SEEK_SET);
+                av_freep(&probe_buffer);
             } else
                 ffio_rewind_with_probe_data(s1->pb, &probe_buffer, probe_buffer_size);
         }