har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/cbs: Allocate more CodedBitstreamUnit at once in cbs_insert_unit()

Browse Source 
Fixes: Timeout (85sec -> 0.5sec)
Fixes: 20791/clusterfuzz-testcase-minimized-ffmpeg_BSF_AV1_FRAME_SPLIT_fuzzer-5659537719951360
Fixes: 21214/clusterfuzz-testcase-minimized-ffmpeg_BSF_MPEG2_METADATA_fuzzer-5165560875974656
Fixes: 21247/clusterfuzz-testcase-minimized-ffmpeg_BSF_H264_METADATA_fuzzer-5715175257931776

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 49ba60fed04d7011c36bae378445ba93ccf983c2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-04-10 22:05:07 +02:00
parent c540f6939d
commit 75df98c0a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cbs.c
View File

@ -693,11 +693,11 @@ static int cbs_insert_unit(CodedBitstreamContext *ctx,
memmove(units + position + 1, units + position, memmove(units + position + 1, units + position,
(frag->nb_units - position) * sizeof(*units)); (frag->nb_units - position) * sizeof(*units));
} else { } else {
units = av_malloc_array(frag->nb_units + 1, sizeof(*units)); units = av_malloc_array(frag->nb_units*2 + 1, sizeof(*units));
if (!units) if (!units)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
++frag->nb_units_allocated; frag->nb_units_allocated = 2*frag->nb_units_allocated + 1;
if (position > 0) if (position > 0)
memcpy(units, frag->units, position * sizeof(*units)); memcpy(units, frag->units, position * sizeof(*units));