| Message ID | 20190801214443.7695-2-michael@niedermayer.cc |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 01, 2019 at 11:44:40PM +0200, Michael Niedermayer wrote: > Fixes: Timeout (10sec -> 30ms) (case 15089) > Fixes: 15089/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PBM_fuzzer-5767535057698816 > Fixes: 16001/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGM_fuzzer-5199169645445120 > Fixes: 16003/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5076443270217728 > > 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 | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) will apply [...]
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index a9771710c2..a613f13477 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "avcodec.h" #include "internal.h" @@ -68,9 +69,12 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) int h, w, depth, maxval; int ret; - pnm_get(s, buf1, sizeof(buf1)); - if(buf1[0] != 'P') + if (s->bytestream_end - s->bytestream < 3 || + s->bytestream[0] != 'P' || + s->bytestream[1] < '1' || + s->bytestream[1] > '7') return AVERROR_INVALIDDATA; + pnm_get(s, buf1, sizeof(buf1)); s->type= buf1[1]-'0'; if (s->type==1 || s->type==4) { @@ -152,7 +156,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) } return 0; } else { - return AVERROR_INVALIDDATA; + av_assert0(0); } pnm_get(s, buf1, sizeof(buf1)); w = atoi(buf1);
Fixes: Timeout (10sec -> 30ms) (case 15089) Fixes: 15089/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PBM_fuzzer-5767535057698816 Fixes: 16001/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGM_fuzzer-5199169645445120 Fixes: 16003/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PGMYUV_fuzzer-5076443270217728 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 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)