aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-06-30 22:19:22 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-14 23:30:38 +0100
commit12dfbefda254180ed2f1ce6795380458c446bd54 (patch)
treea2e83c7d3552cce3f589f23ef645debf839ec782 /libavcodec
parent5bcced7beaedaa89996e7c73cb92dbc63b9341f3 (diff)
downloadffmpeg-12dfbefda254180ed2f1ce6795380458c446bd54.tar.gz
avcodec/h264_refs: Also check reference in ff_h264_build_ref_list()
Fixes: out of array read Fixes: 15409/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5758846959616000 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 7d3581e6bbec309ca0cc617c37cf6e87547764ef) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_refs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 2cdb67f978..e43ce428c5 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -373,9 +373,11 @@ int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl)
av_assert0(0);
}
- if (i < 0) {
+ if (i < 0 || mismatches_ref(h, ref)) {
av_log(h->avctx, AV_LOG_ERROR,
- "reference picture missing during reorder\n");
+ i < 0 ? "reference picture missing during reorder\n" :
+ "mismatching reference\n"
+ );
memset(&sl->ref_list[list][index], 0, sizeof(sl->ref_list[0][0])); // FIXME
} else {
for (i = index; i + 1 < sl->ref_count[list]; i++) {