| Message ID | 20221116233220.5183-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 6634b6ae5f470bea73d46c606a99b79d21d46c37 |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/bonk: Use unsigned in predictor_init_state() to avoid undefined behavior | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 11/17/22, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: repeatly parsing the same data after each 1 byte packet > Fixes: Timeout > Fixes: > 51943/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-5779018251370496 > LGTM > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/apac.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavcodec/apac.c b/libavcodec/apac.c > index 6a1f61b842..e9f6a0dd88 100644 > --- a/libavcodec/apac.c > +++ b/libavcodec/apac.c > @@ -191,6 +191,8 @@ static int apac_decode(AVCodecContext *avctx, AVFrame > *frame, > if (c->bit_length < 0 || > c->bit_length > 17) { > c->bit_length = avctx->bits_per_coded_sample; > + s->bitstream_index = 0; > + s->bitstream_size = 0; > return AVERROR_INVALIDDATA; > } > > -- > 2.17.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
On Thu, Nov 17, 2022 at 01:12:18AM +0100, Paul B Mahol wrote: > On 11/17/22, Michael Niedermayer <michael@niedermayer.cc> wrote: > > Fixes: repeatly parsing the same data after each 1 byte packet > > Fixes: Timeout > > Fixes: > > 51943/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-5779018251370496 > > > > LGTM will apply thx [...]
diff --git a/libavcodec/apac.c b/libavcodec/apac.c index 6a1f61b842..e9f6a0dd88 100644 --- a/libavcodec/apac.c +++ b/libavcodec/apac.c @@ -191,6 +191,8 @@ static int apac_decode(AVCodecContext *avctx, AVFrame *frame, if (c->bit_length < 0 || c->bit_length > 17) { c->bit_length = avctx->bits_per_coded_sample; + s->bitstream_index = 0; + s->bitstream_size = 0; return AVERROR_INVALIDDATA; }
Fixes: repeatly parsing the same data after each 1 byte packet Fixes: Timeout Fixes: 51943/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APAC_fuzzer-5779018251370496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/apac.c | 2 ++ 1 file changed, 2 insertions(+)