]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/av1dec: Check for unset obu instead of crashing
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 25 Oct 2020 23:00:56 +0000 (00:00 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 26 Oct 2020 18:27:53 +0000 (19:27 +0100)
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@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/av1dec.c

index a0a279d65bc154dedabdf518e1363c3e044deb41..bb4295aa6fcdfbb225ad3aaf7ab11c5365a07274 100644 (file)
@@ -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) {