Re: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_refs: Also check reference in ff_h264_build_ref_list()

[Michael Niedermayer]

On Mon, Jul 01, 2019 at 12:16:50AM +0200, Michael Niedermayer wrote:
> 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 
> ---
>  libavcodec/h264_refs.c | 6 --
>  1 file changed, 4 insertions(+), 2 deletions(-)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/4] avcodec/h264_refs: Also check reference in ff_h264_build_ref_list()

[Michael Niedermayer]

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 
---
 libavcodec/h264_refs.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index eaf965e43d..74087ff266 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(>ref_list[list][index], 0, 
sizeof(sl->ref_list[0][0])); // FIXME
 } else {
 for (i = index; i + 1 < sl->ref_count[list]; i++) {
-- 
2.22.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".