summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2021-08-08 20:46:32 +0200
committerMichael Niedermayer <[email protected]>2021-09-08 21:31:50 +0200
commit82fe7775a8cd59f2a576b11db38ff9515c04bd1e (patch)
tree1423858f94adc9a60fe1f04f0a9329adbe0584b6
parent4254dbe20fea3e3e1897c82027f148c868d6c11e (diff)
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 <[email protected]> (cherry picked from commit c59b5e3d1e0121ea23b5b326529f5bdca44cf982) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/vc1dec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index d822240cff..d4ceb60791 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -1154,12 +1154,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;
}
}