[FFmpeg-cvslog] avcodec/cfhd: Check destination space for bayer before writing

Michael Niedermayer git at videolan.org
Mon Aug 5 19:02:46 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Aug  4 12:03:35 2019 +0200| [58e084bd2c7bad8934e0c4eaf40e319927dae729] | committer: Michael Niedermayer

avcodec/cfhd: Check destination space for bayer before writing

Fixes: out of array write
Fixes: 16105/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-5690817309573120
Fixes: 16119/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-5099050675732480
Fixes: 16135/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-5705501601431552

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58e084bd2c7bad8934e0c4eaf40e319927dae729
---

 libavcodec/cfhd.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index a162fc7da3..27eed415d1 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -963,6 +963,15 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
             }
             low  = s->plane[plane].l_h[6];
             high = s->plane[plane].l_h[7];
+
+            if (avctx->pix_fmt == AV_PIX_FMT_BAYER_RGGB16 &&
+                (lowpass_height * 2 > avctx->coded_height / 2 ||
+                 lowpass_width  * 2 > avctx->coded_width  / 2    )
+                ) {
+                ret = AVERROR_INVALIDDATA;
+                goto end;
+            }
+
             for (i = 0; i < lowpass_height * 2; i++) {
                 if (avctx->pix_fmt == AV_PIX_FMT_BAYER_RGGB16)
                     horiz_filter_clip_bayer(dst, low, high, lowpass_width, s->bpc);



More information about the ffmpeg-cvslog mailing list