aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-08-08 20:46:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-09 13:54:52 +0200
commitd6d46907c6a23671115d0ab6be6c138ee89183cc (patch)
tree4273c22cc993e4b3e52ad103ac2d3af4e959fd06
parent51292064a2ce71b2adfc090ed7302b0ed3f0eab9 (diff)
downloadffmpeg-d6d46907c6a23671115d0ab6be6c138ee89183cc.tar.gz
avcodec/vc1dec: ff_print_debug_info() does not support WMV3 field_mode
Fixes: out of array read Fixes: 36331/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV3_fuzzer-5140494328922112.fuzz 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 c59b5e3d1e0121ea23b5b326529f5bdca44cf982) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/vc1dec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 3dfe524c07..402bf2c404 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -1162,12 +1162,14 @@ image:
if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0)
goto err;
- ff_print_debug_info(s, s->current_picture_ptr, pict);
+ if (!v->field_mode)
+ ff_print_debug_info(s, s->current_picture_ptr, pict);
*got_frame = 1;
} else if (s->last_picture_ptr) {
if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0)
goto err;
- ff_print_debug_info(s, s->last_picture_ptr, pict);
+ if (!v->field_mode)
+ ff_print_debug_info(s, s->last_picture_ptr, pict);
*got_frame = 1;
}
}