diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 18:09:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-26 16:56:10 +0100 |
| commit | 0875a9e4fc4cb622758a6b59d4cb07b64f29b8b2 (patch) | |
| tree | 76fd07523420d48f195897b83a32d4db805a249a /libavformat/oggparseogm.c | |
| parent | 6359872877269fa0c1874587676e952d30f9b79f (diff) | |
| download | ffmpeg-0875a9e4fc4cb622758a6b59d4cb07b64f29b8b2.tar.gz | |
avformat/oggparseogm: check input size before reading t
Makes no difference in outcome, as the checks on t have no effect
when t was uninitialized
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa2b7b5d97c_3598_anOTHERS_DixX_in_Ogg_Sample.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparseogm.c')
| -rw-r--r-- | libavformat/oggparseogm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 707381df66..fe4c1f23c4 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -126,6 +126,8 @@ ogm_dshow_header(AVFormatContext *s, int idx) if(*p != 1) return 1; + if (os->psize < 100) + return AVERROR_INVALIDDATA; t = AV_RL32(p + 96); if(t == 0x05589f80){ |