diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-01 21:12:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-23 22:26:50 +0200 |
| commit | 68f30567df5659190bb0515e027be8f1a8116bc5 (patch) | |
| tree | cd6d923a78e25f2bcd6a5641f466ce22317a4f4b | |
| parent | 1a0f106232f51cd20dc0ebab2c02de49ba26fa6b (diff) | |
| download | ffmpeg-68f30567df5659190bb0515e027be8f1a8116bc5.tar.gz | |
avcodec/pnm: skip reading trailing bytes in get_pnm()
None of the keys we support is that long and other keys
lead to decoder failure. None of the values is expected
to be longer, they are all numbers or short keywords.
This simplifies the code
Fixes: Timeout (9sec->43ms)
Fixes: 15177/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PAM_fuzzer-5080556716425216
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pnm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index cadfa7569e..b4e5d3076b 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -58,8 +58,6 @@ static void pnm_get(PNMContext *sc, char *str, int buf_size) c = *bs++; } *s = '\0'; - while (bs < end && !pnm_space(c)) - c = *bs++; sc->bytestream = bs; } |