summaryrefslogtreecommitdiffstats
path: root/libavformat/avidec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-10-17 18:25:48 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-10-18 00:25:41 +0200
commita20f3238be9381518ef8e7fcbb2a4dc7b6acdc93 (patch)
treefb10e4b6dffb9611f48eb6e608662daf9930c68c /libavformat/avidec.c
parentbc7e128a6e8e2a79d0ff7cab5e8a799b3ea042ea (diff)
downloadffmpeg-streaming-a20f3238be9381518ef8e7fcbb2a4dc7b6acdc93.zip
ffmpeg-streaming-a20f3238be9381518ef8e7fcbb2a4dc7b6acdc93.tar.gz
lavf/avidec: Do not fail for very large idx1 tags.
Fixes demuxing the sample file from github pull request 197, the size of its idx1 tag is 6171936 bytes, followed by a JUNK tag of 9505704 bytes.
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r--libavformat/avidec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 2c81267..b291625 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -993,6 +993,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
avi->movi_end = avi->fsize;
goto end_of_header;
}
+ /* Do not fail for very large idx1 tags */
+ case MKTAG('i', 'd', 'x', '1'):
/* skip tag */
size += (size & 1);
avio_skip(pb, size);
OpenPOWER on IntegriCloud