diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-09 02:16:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-07-19 15:26:37 +0200 |
| commit | 01ed8d93b2b9374858285cd6af6bc6b0bce2dcb6 (patch) | |
| tree | c6a76b6498dbdb9856a50b664c185561304868a0 /libavcodec | |
| parent | 1729101c44c093078f9b1e7466c16d06bbbc85bf (diff) | |
| download | ffmpeg-01ed8d93b2b9374858285cd6af6bc6b0bce2dcb6.tar.gz | |
avcodec/shorten: Sanity check maxnlpc
Fixes OOM
Fixes: 2131/clusterfuzz-testcase-minimized-4718045157130240
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 e77ddd31a8e14bcf5eccd6008d866ae90b4b0d4c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -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 2d3540a229..920887b2a0 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -445,6 +445,10 @@ static int read_header(ShortenContext *s) s->blocksize = blocksize; maxnlpc = get_uint(s, LPCQSIZE); + if (maxnlpc > 1024U) { + av_log(s->avctx, AV_LOG_ERROR, "maxnlpc is: %d\n", maxnlpc); + return AVERROR_INVALIDDATA; + } s->nmean = get_uint(s, 0); skip_bytes = get_uint(s, NSKIPSIZE); |