aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-07-02 21:11:57 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-07-17 23:18:50 +0200
commitbb326795d13508c1d0ffc97cb5d75e49e1feca35 (patch)
tree86bf3634cf9fa66dd8e7837f578cd54138531185
parentfff2bdc8b835158773a8360fc2d50a10ca0d38af (diff)
downloadffmpeg-bb326795d13508c1d0ffc97cb5d75e49e1feca35.tar.gz
avformat/takdec: Check for multiple streaminfo
Fixes: memleak Fixes: 15446/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5662875831500800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/takdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/takdec.c b/libavformat/takdec.c
index c51a020161..5e0601806f 100644
--- a/libavformat/takdec.c
+++ b/libavformat/takdec.c
@@ -80,6 +80,8 @@ static int tak_read_header(AVFormatContext *s)
switch (type) {
case TAK_METADATA_STREAMINFO:
+ if (st->codecpar->extradata)
+ return AVERROR_INVALIDDATA;
case TAK_METADATA_LAST_FRAME:
case TAK_METADATA_ENCODER:
if (size <= 3)