[FFmpeg-cvslog] oggparseogm: check timing variables
Anton Khirnov
git at videolan.org
Mon Jan 6 15:33:32 CET 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Nov 28 10:54:35 2013 +0100| [75647dea6f7db79b409bad66a119f5c73da730f3] | committer: Anton Khirnov
oggparseogm: check timing variables
Fixes a potential divide by zero.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75647dea6f7db79b409bad66a119f5c73da730f3
---
libavformat/oggparseogm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 56ea557..2313625 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 */
More information about the ffmpeg-cvslog
mailing list