| Message ID | 20210310182301.12537-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/4xm: Check pre_gb in decode_i_block() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/x86_make | success | Make finished |
| andriy/x86_make_fate | success | Make fate finished |
| andriy/PPC64_make | success | Make finished |
| andriy/PPC64_make_fate | success | Make fate finished |
while there fix style issue On Wed, Mar 10, 2021 at 7:30 PM Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: Timeout > Fixes: > 31257/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FOURXM_fuzzer-5150866229297152 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by > <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>: > Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/4xm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c > index 4d58b093f7..5e0f0c689c 100644 > --- a/libavcodec/4xm.c > +++ b/libavcodec/4xm.c > @@ -499,8 +499,8 @@ static int decode_i_block(FourXContext *f, int16_t > *block) > { > int code, i, j, level, val; > > - if (get_bits_left(&f->gb) < 2){ > - av_log(f->avctx, AV_LOG_ERROR, "%d bits left before > decode_i_block()\n", get_bits_left(&f->gb)); > + if (get_bits_left(&f->pre_gb) < 2){ > + av_log(f->avctx, AV_LOG_ERROR, "%d bits left before > decode_i_block()\n", get_bits_left(&f->pre_gb)); > 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 Wed, Mar 10, 2021 at 07:31:55PM +0100, Paul B Mahol wrote:
> while there fix style issue
will apply with the whitespace added between ){
thanks
[...]
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 4d58b093f7..5e0f0c689c 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -499,8 +499,8 @@ static int decode_i_block(FourXContext *f, int16_t *block) { int code, i, j, level, val; - if (get_bits_left(&f->gb) < 2){ - av_log(f->avctx, AV_LOG_ERROR, "%d bits left before decode_i_block()\n", get_bits_left(&f->gb)); + if (get_bits_left(&f->pre_gb) < 2){ + av_log(f->avctx, AV_LOG_ERROR, "%d bits left before decode_i_block()\n", get_bits_left(&f->pre_gb)); return AVERROR_INVALIDDATA; }
Fixes: Timeout Fixes: 31257/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FOURXM_fuzzer-5150866229297152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/4xm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)