RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/cbs_h2645: Treat slices without data as invalid 

Slices that end after their header (meaning slices after the header
without any data before the rbsp_stop_one_bit or possibly without any
rbsp_stop_one_bit at all) are invalid and are now dropped. This ensures
that one doesn't run into two asserts in cbs_h2645_write_slice_data().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Fixes: 19629/clusterfuzz-testcase-minimized-ffmpeg_BSF_H264_METADATA_fuzzer-5676822528524288
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Andreas Rheinhardt 2019-12-09 23:26:03 +01:00 committed by Michael Niedermayer
parent 8f701932b3
commit 66fac1ff7c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/cbs_h2645.c
View File

@ -861,6 +861,9 @@ static int cbs_h264_read_nal_unit(CodedBitstreamContext *ctx,
if (err < 0) if (err < 0)
return err; return err;
if (!cbs_h2645_read_more_rbsp_data(&gbc))
return AVERROR_INVALIDDATA;
pos = get_bits_count(&gbc); pos = get_bits_count(&gbc);
len = unit->data_size; len = unit->data_size;
@ -1036,6 +1039,9 @@ static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx,
if (err < 0) if (err < 0)
return err; return err;
if (!cbs_h2645_read_more_rbsp_data(&gbc))
return AVERROR_INVALIDDATA;
pos = get_bits_count(&gbc); pos = get_bits_count(&gbc);
len = unit->data_size; len = unit->data_size;