Browse Source

avcodec/cbs_h2645: Skip all 0 NAL units

Fixes: assertion failure
Fixes: 19286/clusterfuzz-testcase-minimized-ffmpeg_BSF_H264_REDUNDANT_PPS_fuzzer-5707990724509696

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 285138ef14)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.0.6
Michael Niedermayer 6 years ago
parent
commit
4582fddb3d
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      libavcodec/cbs_h2645.c

+ 4
- 1
libavcodec/cbs_h2645.c View File

@@ -479,7 +479,10 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx,
// Remove trailing zeroes.
while (size > 0 && nal->data[size - 1] == 0)
--size;
av_assert0(size > 0);
if (size == 0) {
av_log(ctx->log_ctx, AV_LOG_VERBOSE, "Discarding empty 0 NAL unit\n");
continue;
}

data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!data)


Loading…
Cancel
Save