mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
avcodec/pnm_parser: Check av_image_get_buffer_size() for failure
Fixes: out of array access
Fixes: 30135/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PBM_fuzzer-4997145650397184
Fixes: 30208/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5605891665690624.fuzz
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5314a4996c
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
de6e245fce
commit
0146375f9a
@ -69,8 +69,10 @@ retry:
|
||||
} else if (pnmctx.type < 4) {
|
||||
next = END_NOT_FOUND;
|
||||
} else {
|
||||
next = pnmctx.bytestream - pnmctx.bytestream_start
|
||||
+ av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);
|
||||
int ret = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);
|
||||
next = pnmctx.bytestream - pnmctx.bytestream_start;
|
||||
if (ret >= 0)
|
||||
next += ret;
|
||||
if (pnmctx.bytestream_start != buf)
|
||||
next -= pc->index;
|
||||
if (next > buf_size)
|
||||
|
Loading…
Reference in New Issue
Block a user