Re: [FFmpeg-devel] [PATCH] avcodec/hq_hqa: Check available space before reading slice offsets
On Sun, May 12, 2019 at 09:45:59AM +0200, Paul B Mahol wrote: > On 5/12/19, Michael Niedermayer wrote: > > Fixes: Timeout (43sec -> 18sec) > > Fixes: > > 14556/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HQ_HQA_fuzzer-5673543024508928 > > > > Found-by: continuous fuzzing process > > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer > > --- > > libavcodec/hq_hqa.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c > > index ec9da3e04f..90bafdc72a 100644 > > --- a/libavcodec/hq_hqa.c > > +++ b/libavcodec/hq_hqa.c > > @@ -248,6 +248,9 @@ static int hqa_decode_frame(HQContext *ctx, AVFrame > > *pic, size_t data_size) > > int width, height, quant; > > const uint8_t *src = ctx->gbc.buffer; > > > > +if (bytestream2_get_bytes_left(>gbc) < 8 + 4*(num_slices + 1)) > > +return AVERROR_INVALIDDATA; > > + > > width = bytestream2_get_be16(>gbc); > > height = bytestream2_get_be16(>gbc); > > > > LGTM will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Those who are best at talking, realize last or never when they are wrong. signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avcodec/hq_hqa: Check available space before reading slice offsets
On 5/12/19, Michael Niedermayer wrote: > Fixes: Timeout (43sec -> 18sec) > Fixes: > 14556/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HQ_HQA_fuzzer-5673543024508928 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavcodec/hq_hqa.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c > index ec9da3e04f..90bafdc72a 100644 > --- a/libavcodec/hq_hqa.c > +++ b/libavcodec/hq_hqa.c > @@ -248,6 +248,9 @@ static int hqa_decode_frame(HQContext *ctx, AVFrame > *pic, size_t data_size) > int width, height, quant; > const uint8_t *src = ctx->gbc.buffer; > > +if (bytestream2_get_bytes_left(>gbc) < 8 + 4*(num_slices + 1)) > +return AVERROR_INVALIDDATA; > + > width = bytestream2_get_be16(>gbc); > height = bytestream2_get_be16(>gbc); > LGTM > -- > 2.21.0 > > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
