summaryrefslogtreecommitdiff
path: root/libavformat/vividas.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-04 12:13:21 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-08-05 17:54:24 +0200
commit76133d7c8bfe19833e1973849eabe6a78913e4aa (patch)
tree8d6e6b0dbb5d56847e56cbf1f2f4eba01cac1dc1 /libavformat/vividas.c
parent58e084bd2c7bad8934e0c4eaf40e319927dae729 (diff)
avformat/vividas: Fix memleak of AVIOContext in track_header()
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>
Diffstat (limited to 'libavformat/vividas.c')
-rw-r--r--libavformat/vividas.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index c3d3cf548c..e70c9164a1 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -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;