On Wed, Dec 01, 2021 at 04:15:49PM +1100, Peter Ross wrote: > On Sun, Nov 28, 2021 at 07:55:14PM +0100, Michael Niedermayer wrote: > > Fixes: Timeout > > Fixes: > > 41083/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GEM_fuzzer-5843826518917120 > > > > Found-by: continuous fuzzing process > > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer <[email protected]> > > --- > > libavcodec/gemdec.c | 11 ++++++++--- > > 1 file changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/libavcodec/gemdec.c b/libavcodec/gemdec.c > > index 2464dda8a7e..eee21a50d4b 100644 > > --- a/libavcodec/gemdec.c > > +++ b/libavcodec/gemdec.c > > @@ -157,6 +157,14 @@ static int gem_decode_frame(AVCodecContext *avctx, > > if (header_size >= 11) > > tag = bytestream2_peek_be32(&gb); > > > > + if (tag == AV_RB32("STTT") || tag == AV_RB32("TIMG") || tag == > > AV_RB32("XIMG") || > > + planes == 1 || planes == 2 || planes == 3 || planes == 4 || > > + planes == 8 || planes == 16 || planes == 24) { > > + } else { > > + avpriv_request_sample(avctx, "planes=%d", planes); > > + return AVERROR_PATCHWELCOME; > > + } > > + > > if ((ret = ff_get_buffer(avctx, p, 0)) < 0) > > return ret; > > > > @@ -236,9 +244,6 @@ static int gem_decode_frame(AVCodecContext *avctx, > > planes = 1; > > row_width = avctx->width * pixel_size; > > put_lines = put_lines_bytes; > > - } else { > > - avpriv_request_sample(avctx, "planes=%d", planes); > > - return AVERROR_PATCHWELCOME; > > } > > > > ret = av_reallocp_array(&avctx->priv_data, planes, row_width); > > please apply
Will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB While the State exists there can be no freedom; when there is freedom there will be no State. -- Vladimir Lenin
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
