| Message ID | 20190310234209.9975-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 14eea7c47a9275dbef0168ee5e13424d1fd58357 |
| Headers | show |
On Mon, Mar 11, 2019 at 12:42:08AM +0100, Michael Niedermayer wrote: > Fixes: Timeout 13149 (5sec -> 3sec), 13166 (11sec -> 7sec), 13430 (5sec -> 3sec) > Fixes: 13149/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGM_fuzzer-5760833622114304 > Fixes: 13166/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5763216322330624 > Fixes: 13430/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PPM_fuzzer-5758658334425088 > > 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.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) will apply patchset [...]
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 17926f256f..a9771710c2 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -52,12 +52,13 @@ static void pnm_get(PNMContext *sc, char *str, int buf_size) } s = str; - while (bs < end && !pnm_space(c)) { - if ((s - str) < buf_size - 1) - *s++ = c; + while (bs < end && !pnm_space(c) && (s - str) < buf_size - 1) { + *s++ = c; c = *bs++; } *s = '\0'; + while (bs < end && !pnm_space(c)) + c = *bs++; sc->bytestream = bs; }
Fixes: Timeout 13149 (5sec -> 3sec), 13166 (11sec -> 7sec), 13430 (5sec -> 3sec) Fixes: 13149/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGM_fuzzer-5760833622114304 Fixes: 13166/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5763216322330624 Fixes: 13430/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PPM_fuzzer-5758658334425088 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.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)