summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2023-01-12 23:42:59 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2023-04-15 22:38:08 +0200
commit4bd974e42641f689b13f00db7d4682bcc2b6a1f6 (patch)
tree5613c6827165deb3f0faaba925c0a62a84dd745a
parentf07f46121a1a5d493298653ae47dbed26f5a3894 (diff)
downloadffmpeg-4bd974e42641f689b13f00db7d4682bcc2b6a1f6.tar.gz
avcodec/motionpixels: Mask pixels to valid values
Fixes: out of array access Fixes: 48567/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOTIONPIXELS_fuzzer-6724203352555520 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 ac6eec1fc258efce219e4fccb84312a1b13a7a23) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/motionpixels.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index 6cb444a703..5a7ad7a630 100644
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -185,7 +185,7 @@ static YuvPixel mp_get_yuv_from_rgb(MotionPixelsContext *mp, int x, int y)
int color;
color = *(uint16_t *)&mp->frame->data[0][y * mp->frame->linesize[0] + x * 2];
- return mp_rgb_yuv_table[color];
+ return mp_rgb_yuv_table[color & 0x7FFF];
}
static void mp_set_rgb_from_yuv(MotionPixelsContext *mp, int x, int y, const YuvPixel *p)