diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-27 13:03:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-02 01:14:38 +0200 |
| commit | dbff2d602d86c13627ee785a748988d4f1c964cc (patch) | |
| tree | 2a75e000463701ce3f604d603bec5684d1e66cc1 | |
| parent | 92a23e2a639c6805f433c2bff2009ff02c464789 (diff) | |
| download | ffmpeg-dbff2d602d86c13627ee785a748988d4f1c964cc.tar.gz | |
avcodec/pixlet: Fix runtime error: signed integer overflow: 2147483647 + 32 cannot be represented in type 'int'
Fixes: 1829/clusterfuzz-testcase-minimized-5527165321871360
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 77d98898211eeb0241e8411428b0b364a6231744)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pixlet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c index 0dfd5edbf7..0e541a9ccb 100644 --- a/libavcodec/pixlet.c +++ b/libavcodec/pixlet.c @@ -594,6 +594,10 @@ static int pixlet_decode_frame(AVCodecContext *avctx, void *data, width = bytestream2_get_be32(&ctx->gb); height = bytestream2_get_be32(&ctx->gb); + if ( width > INT_MAX - (1U << (NB_LEVELS + 1)) + || height > INT_MAX - (1U << (NB_LEVELS + 1))) + return AVERROR_INVALIDDATA; + w = FFALIGN(width, 1 << (NB_LEVELS + 1)); h = FFALIGN(height, 1 << (NB_LEVELS + 1)); |