From 10ea6c3116f95fc7f79d268ee2b839eea477337c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 10 Sep 2019 00:04:08 +0200 Subject: [PATCH] avcodec/pnm_parser: Use memchr() in pnm_parse() Fixes: Timeout (45sec -> 0.5sec) Fixes: 16942/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PPM_fuzzer-5085393073995776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/pnm_parser.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index 94777d2ccaf91..d19dbfe98c079 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -95,8 +95,11 @@ static int pnm_parse(AVCodecParserContext *s, AVCodecContext *avctx, sync = bs; c = *bs++; if (c == '#') { - while (c != '\n' && bs < end) - c = *bs++; + uint8_t *match = memchr(bs, '\n', end-bs); + if (match) + bs = match + 1; + else + break; } else if (c == 'P') { next = bs - pnmctx.bytestream_start + skip - 1; pnmpc->ascii_scan = 0;