diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-17 22:26:45 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-02 21:41:48 +0300 |
| commit | 1894a36d6cbf32832d26262da573a07f456324f2 (patch) | |
| tree | ebc902c3cd91c3995174f41a02921a7fbd785fc5 /libavcodec/libvorbisdec.c | |
| parent | 3af9317a113a319af08dcfc7ece6a6430b9baada (diff) | |
avcodec/libvorbisdec: Check extradata size
Fixes: out of array read
Fixes: 15261/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBVORBIS_fuzzer-5764908467093504
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cf3c245566e8a8d45ed2ad9fdff9ef50327ba2d3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/libvorbisdec.c')
| -rw-r--r-- | libavcodec/libvorbisdec.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c index 2b22e057ec..e2a6531f00 100644 --- a/libavcodec/libvorbisdec.c +++ b/libavcodec/libvorbisdec.c @@ -47,8 +47,16 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) { vorbis_comment_init(&context->vc) ; if(p[0] == 0 && p[1] == 30) { + int sizesum = 0; for(i = 0; i < 3; i++){ hsizes[i] = bytestream_get_be16((const uint8_t **)&p); + sizesum += 2 + hsizes[i]; + if (sizesum > avccontext->extradata_size) { + av_log(avccontext, AV_LOG_ERROR, "vorbis extradata too small\n"); + ret = AVERROR_INVALIDDATA; + goto error; + } + headers[i] = p; p += hsizes[i]; } |