diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-11 19:19:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-03 12:10:23 +0200 |
| commit | 94a1280fb0b1a1cf34c7f28d2c2d2e42c42840b3 (patch) | |
| tree | e86709ca53ac363a58d4b55e05dfd67a39bdad32 | |
| parent | 7be077fcf88d1cb0c81e1ba761288ab82e4d7bc9 (diff) | |
| download | ffmpeg-94a1280fb0b1a1cf34c7f28d2c2d2e42c42840b3.tar.gz | |
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 285138ef14327ec71f356e3a923c4adde0874dc6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/cbs_h2645.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index e44b683b61..54a593464b 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -544,7 +544,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) |