diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-01-08 20:03:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-05-26 00:04:33 +0200 |
| commit | dd507e4c8f1596ae3d84eec2477532fef0d046df (patch) | |
| tree | d7ba87ea10f74c094f3a1f018a9e6fbdc6668178 | |
| parent | cae611f86407ed7001437f59792f6ea18d3064da (diff) | |
| download | ffmpeg-dd507e4c8f1596ae3d84eec2477532fef0d046df.tar.gz | |
avcodec/scpr: Test bx before use
Fixes: out of array access on 32bit
Fixes: 54850/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5302669294305280
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1b59de3770b2e3f7f44ec4adba27c88b79adaaec)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/scpr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index 297fb315e2..a2d5bb6514 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -592,6 +592,9 @@ static int decompress_p(AVCodecContext *avctx, int run, z, bx = x * 16 + sx1, by = y * 16 + sy1; unsigned r, g, b, clr, ptype = 0; + if (bx >= avctx->width) + return AVERROR_INVALIDDATA; + for (; by < y * 16 + sy2 && by < avctx->height;) { ret = decode_value(s, s->op_model[ptype], 6, 1000, &ptype); if (ret < 0) |