| Message ID | 20190909233651.30030-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 10ea6c3116f95fc7f79d268ee2b839eea477337c |
| Headers | show |
lgtm On 9/10/19, Michael Niedermayer <michael@niedermayer.cc> wrote: > 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 > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > 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 94777d2cca..d19dbfe98c 100644 > --- a/libavcodec/pnm_parser.c > +++ b/libavcodec/pnm_parser.c > @@ -95,8 +95,11 @@ retry: > 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; > -- > 2.23.0 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index 94777d2cca..d19dbfe98c 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -95,8 +95,11 @@ retry: 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;
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 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/pnm_parser.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)