avformat/vividas: Fix memleak of AVIOContext in track_header()
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 4 Aug 2019 10:13:21 +0000 (12:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 5 Aug 2019 15:54:24 +0000 (17:54 +0200)
Fixes: memleak
Fixes: 16127/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5649290914955264

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

index c3d3cf5..e70c916 100644 (file)
@@ -375,15 +375,19 @@ static int track_header(VividasDemuxContext *viv, AVFormatContext *s,  uint8_t *
             num_data = avio_r8(pb);
             for (j = 0; j < num_data; j++) {
                 uint64_t len = ffio_read_varlen(pb);
-                if (len > INT_MAX/2 - xd_size)
+                if (len > INT_MAX/2 - xd_size) {
+                    av_free(pb);
                     return AVERROR_INVALIDDATA;
+                }
                 data_len[j] = len;
                 xd_size += len;
             }
 
             st->codecpar->extradata_size = 64 + xd_size + xd_size / 255;
-            if (ff_alloc_extradata(st->codecpar, st->codecpar->extradata_size))
+            if (ff_alloc_extradata(st->codecpar, st->codecpar->extradata_size)) {
+                av_free(pb);
                 return AVERROR(ENOMEM);
+            }
 
             p = st->codecpar->extradata;
             p[0] = 2;