diff options
| author | Michael Niedermayer <[email protected]> | 2021-03-30 13:22:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-10-06 14:41:41 +0200 |
| commit | f08c4b72f2e0c22cc01a4757891ac01513dd85bb (patch) | |
| tree | 352f4c77c59931f40f0dd9df79e07ee9e5299bf0 | |
| parent | af51095d9c37baf0b12bb37053745dde6e7167fa (diff) | |
avcodec/pnm_parser: Check image size addition for overflow
Fixes: assertion failure
Fixes: out of array access
Fixes: 32664/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-6533642202513408.fuzz
Fixes: 32669/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-6001928875147264
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 79ac8d55468adc9cb9a0908e671807a2a789b7d0)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/pnm_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index f3be6d640c..a822c17a2e 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -111,7 +111,7 @@ retry: } else { int ret = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); next = pnmctx.bytestream - pnmctx.bytestream_start + skip; - if (ret >= 0) + if (ret >= 0 && next + (uint64_t)ret <= INT_MAX) next += ret; } if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip) |