diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 19:18:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:43:41 +0200 |
| commit | e8ce2770b12ad8d1dfb9adce66b6fd3fc560aeda (patch) | |
| tree | 8fe6f70ffb2446c7436a1f76f7b87ca3458248c9 /libavcodec | |
| parent | e3a521d817cb7d36acc6e1e7cda8d6a70e967be6 (diff) | |
| download | ffmpeg-e8ce2770b12ad8d1dfb9adce66b6fd3fc560aeda.tar.gz | |
avcodec/vp8: Check buffer size in vp8_decode_frame_header()
avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 599d746e07319dc792ed2e511b666fe482f1ff88)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp8.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 73e9d18275..0dae1b2a19 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -639,6 +639,11 @@ static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si int width = s->avctx->width; int height = s->avctx->height; + if (buf_size < 3) { + av_log(s->avctx, AV_LOG_ERROR, "Insufficent data (%d) for header\n", buf_size); + return AVERROR_INVALIDDATA; + } + s->keyframe = !(buf[0] & 1); s->profile = (buf[0]>>1) & 7; s->invisible = !(buf[0] & 0x10); |