diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-01-12 22:05:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-02-25 22:50:10 +0100 |
| commit | 1eb1acb62b5afe215643a55f06c16545e5b20fb6 (patch) | |
| tree | 2204519f3b61454a56a2aa26a6230ef1b1834620 /libavcodec | |
| parent | 718d6c71ef7eff75050e636e6ea5cde165496488 (diff) | |
| download | ffmpeg-1eb1acb62b5afe215643a55f06c16545e5b20fb6.tar.gz | |
avcodec/xpmdec: Check size before allocation to avoid truncation
Fixes:OOM
Fixes:out of array access (no testcase)
Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XPM_fuzzer-6573323838685184
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 95f0f84dae4f040d91f1e60dc5438612c58e8906)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/xpmdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c index ff1f51dd32..2550afb9d6 100644 --- a/libavcodec/xpmdec.c +++ b/libavcodec/xpmdec.c @@ -354,6 +354,9 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p, return AVERROR_INVALIDDATA; } + if (size > SIZE_MAX / 4) + return AVERROR(ENOMEM); + size *= 4; ptr += mod_strcspn(ptr, ",") + 1; |