summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2023-01-13 01:01:36 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2023-04-07 23:40:41 +0200
commite5a88d62b6ec2fa712c921116feaa038fa824f70 (patch)
tree1c64bcf672852e1dae80e6af5684ab2aff4f4f3c
parent2ae1a70cd5603d887d92848767a859c0385c9644 (diff)
downloadffmpeg-e5a88d62b6ec2fa712c921116feaa038fa824f70.tar.gz
avcodec/012v: Order operations for odd size handling
Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZERO12V_fuzzer-6714182078955520.fuzz Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZERO12V_fuzzer-6698145212137472.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 4d42d82563d806b5610c0c91497e24ef7f37d4cf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/012v.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c
index b5a4066656..41d9e2708e 100644
--- a/libavcodec/012v.c
+++ b/libavcodec/012v.c
@@ -131,8 +131,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
u = x/2 + (uint16_t *)(pic->data[1] + line * pic->linesize[1]);
v = x/2 + (uint16_t *)(pic->data[2] + line * pic->linesize[2]);
memcpy(y, y_temp, sizeof(*y) * (width - x));
- memcpy(u, u_temp, sizeof(*u) * (width - x + 1) / 2);
- memcpy(v, v_temp, sizeof(*v) * (width - x + 1) / 2);
+ memcpy(u, u_temp, sizeof(*u) * ((width - x + 1) / 2));
+ memcpy(v, v_temp, sizeof(*v) * ((width - x + 1) / 2));
}
line_end += stride;