diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-05 13:03:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-10 01:52:56 +0200 |
| commit | f41da2bd5ff7d9d6b1141284dbd526d8b232e29b (patch) | |
| tree | fc58ca735d939f8b7910f9918ab85e3e817e0253 | |
| parent | ce4cb475a3714def0ad80a5ad74f2c9c90683f88 (diff) | |
| download | ffmpeg-f41da2bd5ff7d9d6b1141284dbd526d8b232e29b.tar.gz | |
avcodec/shorten: Sanity check nmeans
Fixes: OOM
Fixes: 8195/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5179785826271232
The reference software appears to use longs for 32bits and it uses int for nmeans
hinting that the intended maximum size was not 32bit.
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 d91a0b503d7a886587281bc1ee42476aa5e89f85)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/shorten.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index e4bf2e0035..b8a5664ce9 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -374,6 +374,10 @@ static int read_header(ShortenContext *s) return AVERROR_INVALIDDATA; } s->nmean = get_uint(s, 0); + if (s->nmean > 32768U) { + av_log(s->avctx, AV_LOG_ERROR, "nmean is: %d\n", s->nmean); + return AVERROR_INVALIDDATA; + } skip_bytes = get_uint(s, NSKIPSIZE); if ((unsigned)skip_bytes > get_bits_left(&s->gb)/8) { |