[FFmpeg-cvslog] avcodec/dxv: Initialize tex_funct to NULL

Michael Niedermayer git at videolan.org
Mon Jul 8 14:09:28 EEST 2019


ffmpeg | branch: release/4.1 | Michael Niedermayer <michael at niedermayer.cc> | Mon Jun  3 11:22:36 2019 +0200| [c697819aee7ff44181077859ca5f0962049272e2] | committer: Michael Niedermayer

avcodec/dxv: Initialize tex_funct to NULL

Fixes: Various anomalies
Fixes: 14493/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5071018000908288
Fixes: 14630/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5714888963391488

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

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

 libavcodec/dxv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index 7ae3315493..e28a6ba724 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -1055,6 +1055,10 @@ static int dxv_decode(AVCodecContext *avctx, void *data,
     avctx->pix_fmt = AV_PIX_FMT_RGBA;
     avctx->colorspace = AVCOL_SPC_RGB;
 
+    ctx->tex_funct = NULL;
+    ctx->tex_funct_planar[0] = NULL;
+    ctx->tex_funct_planar[1] = NULL;
+
     tag = bytestream2_get_le32(gbc);
     switch (tag) {
     case MKBETAG('D', 'X', 'T', '1'):



More information about the ffmpeg-cvslog mailing list