[FFmpeg-devel] [PATCH 1/4] avcodec/pnm_parser: Check av_image_get_buffer_size() for failure
Michael Niedermayer
michael at niedermayer.cc
Thu Feb 11 23:17:12 EET 2021
Fixes: out of array access
Fixes: 30135/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PBM_fuzzer-4997145650397184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/pnm_parser.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c
index d19dbfe98c..f3be6d640c 100644
--- a/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@ -109,8 +109,10 @@ retry:
if (next == END_NOT_FOUND)
pnmpc->ascii_scan = sync - pnmctx.bytestream + skip;
} else {
- next = pnmctx.bytestream - pnmctx.bytestream_start + skip
- + 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 + skip;
+ if (ret >= 0)
+ next += ret;
}
if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip)
next -= pc->index;
--
2.17.1
More information about the ffmpeg-devel
mailing list