summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-08-22 22:10:09 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2022-10-28 21:04:04 +0200
commit7a9fd7a2ca3951a0051512af086f92b31614c62d (patch)
tree8837e88aae2a47cb517cc77940090dfb4f29045f
parenta87ad0dba0ce0c152cb4005f13731827383d3e75 (diff)
downloadffmpeg-7a9fd7a2ca3951a0051512af086f92b31614c62d.tar.gz
libavcodec/8bps: Check that line lengths fit within the buffer
Fixes: Timeout Fixes: undefined pointer arithmetic Fixes: 50330/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EIGHTBPS_fuzzer-5436287485607936 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 2316d5ec1a95b13ff9a0ce80409fa367a041966d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/8bps.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 14f7bd5bf6..caf18cf66e 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -70,6 +70,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
unsigned char *planemap = c->planemap;
int ret;
+ if (buf_size < planes * height *2)
+ return AVERROR_INVALIDDATA;
+
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;