| Message ID | 20180226022947.3129-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | bbed942dfd64c43d8f943532d8e12f10e7613938 |
| Headers | show |
On Mon, Feb 26, 2018 at 03:29:46AM +0100, Michael Niedermayer wrote: > Fixes: Timeout > Fixes: 6266/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-5692431816196096 > > Its not known if nb_tiles is allowed so it is not treated as an error > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/rscc.c | 6 ++++++ > 1 file changed, 6 insertions(+) patchset applied [...]
diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c index f270cd5351..dae5e84634 100644 --- a/libavcodec/rscc.c +++ b/libavcodec/rscc.c @@ -157,6 +157,12 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data, /* Read number of tiles, and allocate the array */ tiles_nb = bytestream2_get_le16(gbc); + + if (tiles_nb == 0) { + av_log(avctx, AV_LOG_DEBUG, "no tiles\n"); + return avpkt->size; + } + av_fast_malloc(&ctx->tiles, &ctx->tiles_size, tiles_nb * sizeof(*ctx->tiles)); if (!ctx->tiles) {
Fixes: Timeout Fixes: 6266/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-5692431816196096 Its not known if nb_tiles is allowed so it is not treated as an error Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/rscc.c | 6 ++++++ 1 file changed, 6 insertions(+)