[FFmpeg-cvslog] avcodec/av1dec: Check for unset obu instead of crashing

Michael Niedermayer git at videolan.org
Mon Oct 26 20:50:23 EET 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Oct 26 00:00:56 2020 +0100| [718e862da3e254c58447c0873decb335f688fa09] | committer: Michael Niedermayer

avcodec/av1dec: Check for unset obu instead of crashing

Fixes: NULL pointer dereference
Fixes: 26550/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AV1_fuzzer-5417762807349248

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/av1dec.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
index a0a279d65b..bb4295aa6f 100644
--- a/libavcodec/av1dec.c
+++ b/libavcodec/av1dec.c
@@ -673,7 +673,12 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame,
     for (int i = 0; i < s->current_obu.nb_units; i++) {
         CodedBitstreamUnit *unit = &s->current_obu.units[i];
         AV1RawOBU *obu = unit->content;
-        const AV1RawOBUHeader *header = &obu->header;
+        const AV1RawOBUHeader *header;
+
+        if (!obu)
+            continue;
+
+        header = &obu->header;
         av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type);
 
         switch (unit->type) {



More information about the ffmpeg-cvslog mailing list