diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-28 10:54:35 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-02-01 23:51:46 -0500 |
| commit | bf7c240a50f8ed99a42e08bb7a8a70262cce34ad (patch) | |
| tree | 5cb126ed4553f248edbc31ee5776b58f16e5a472 | |
| parent | 03bfd8419fbaf9c72b293457437bd508dea64736 (diff) | |
| download | ffmpeg-bf7c240a50f8ed99a42e08bb7a8a70262cce34ad.tar.gz | |
oggparseogm: check timing variables
Fixes a potential divide by zero.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit 75647dea6f7db79b409bad66a119f5c73da730f3)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavformat/oggparseogm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 56ea5575f2..23136257bf 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -75,6 +75,11 @@ ogm_header(AVFormatContext *s, int idx) time_unit = bytestream2_get_le64(&p); spu = bytestream2_get_le64(&p); + if (!time_unit || !spu) { + av_log(s, AV_LOG_ERROR, "Invalid timing values.\n"); + return AVERROR_INVALIDDATA; + } + bytestream2_skip(&p, 4); /* default_len */ bytestream2_skip(&p, 8); /* buffersize + bits_per_sample */ |