[FFmpeg-devel] [PATCH 2/2] avcodec/rawdec: Use linesize in b64a
Michael Niedermayer
michael at niedermayer.cc
Thu Jan 2 02:01:52 EET 2020
Fixes: out of array access
Fixes: 19750/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RAWVIDEO_fuzzer-5074834119983104
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/rawdec.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 0b2d8708e6..a110a690f5 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -467,10 +467,13 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
avctx->pix_fmt == AV_PIX_FMT_RGBA64BE) {
uint8_t *dst = frame->data[0];
uint64_t v;
- int x;
- for (x = 0; x >> 3 < avctx->width * avctx->height; x += 8) {
- v = AV_RB64(&dst[x]);
- AV_WB64(&dst[x], v << 16 | v >> 48);
+ int x, y;
+ for (y = 0; y < avctx->height; y++) {
+ for (x = 0; x >> 3 < avctx->width; x += 8) {
+ v = AV_RB64(&dst[x]);
+ AV_WB64(&dst[x], v << 16 | v >> 48);
+ }
+ dst += frame->linesize[0];
}
}
--
2.24.0
More information about the ffmpeg-devel
mailing list