| Message ID | 20190930163027.11686-3-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 97450d2b6a08769cbc4665bc66f6db9e8c5da2a4 |
| Headers | show |
lgtm On 9/30/19, Michael Niedermayer <michael@niedermayer.cc> wrote: > Fixes: signed integer overflow: -2147483648 - 8 cannot be represented in > type 'int' > Fixes: > 17745/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5734628463214592 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/dxv.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c > index 8d5e4b1c6c..d67412a3a2 100644 > --- a/libavcodec/dxv.c > +++ b/libavcodec/dxv.c > @@ -799,6 +799,9 @@ static int dxv_decompress_yo(DXVContext *ctx, > GetByteContext *gb, > uint8_t *dst, *table0[256] = { 0 }, *table1[256] = { 0 }; > int ret, state = 0, skip, oi = 0, v, vv; > > + if (op_offset < 8 || op_offset - 8 > bytestream2_get_bytes_left(gb)) > + return AVERROR_INVALIDDATA; > + > dst = tex_data; > bytestream2_skip(gb, op_offset - 8); > if (op_size > max_op_size) > -- > 2.23.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-request@ffmpeg.org with subject "unsubscribe".
On Mon, Sep 30, 2019 at 06:42:11PM +0200, Paul B Mahol wrote:
> lgtm
will apply
thx
[...]
diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c index 8d5e4b1c6c..d67412a3a2 100644 --- a/libavcodec/dxv.c +++ b/libavcodec/dxv.c @@ -799,6 +799,9 @@ static int dxv_decompress_yo(DXVContext *ctx, GetByteContext *gb, uint8_t *dst, *table0[256] = { 0 }, *table1[256] = { 0 }; int ret, state = 0, skip, oi = 0, v, vv; + if (op_offset < 8 || op_offset - 8 > bytestream2_get_bytes_left(gb)) + return AVERROR_INVALIDDATA; + dst = tex_data; bytestream2_skip(gb, op_offset - 8); if (op_size > max_op_size)
Fixes: signed integer overflow: -2147483648 - 8 cannot be represented in type 'int' Fixes: 17745/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5734628463214592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/dxv.c | 3 +++ 1 file changed, 3 insertions(+)