RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2021-02-10 22:28:20 +01:00
parent 7628ea6d01
commit a2dbe8005d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pnm_parser.c
View File

@ -106,8 +106,10 @@ retry:
if (next == END_NOT_FOUND) if (next == END_NOT_FOUND)
pnmpc->ascii_scan = sync - pnmctx.bytestream + skip; pnmpc->ascii_scan = sync - pnmctx.bytestream + skip;
} else { } else {
next = pnmctx.bytestream - pnmctx.bytestream_start + skip int ret = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);
+ av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); next = pnmctx.bytestream - pnmctx.bytestream_start + skip;
if (ret >= 0)
next += ret;
} }
if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip) if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip)
next -= pc->index; next -= pc->index;