mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
avcodec/hcadec: do not set hfr_group_count to invalid values
Fixes: 62285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HCA_fuzzer-6247136417087488 Fixes: out of array write 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 addb85ea39300c36010ffb6dc0d28b2ea62b4805) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
435f172b5d
commit
30fe9d3511
@ -212,6 +212,7 @@ static int init_hca(AVCodecContext *avctx, const uint8_t *extradata,
|
||||
int8_t r[16] = { 0 };
|
||||
unsigned b, chunk;
|
||||
int version, ret;
|
||||
unsigned hfr_group_count;
|
||||
|
||||
init_flush(avctx);
|
||||
|
||||
@ -336,11 +337,12 @@ static int init_hca(AVCodecContext *avctx, const uint8_t *extradata,
|
||||
if (c->total_band_count < c->base_band_count)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
c->hfr_group_count = ceil2(c->total_band_count - (c->base_band_count + c->stereo_band_count),
|
||||
hfr_group_count = ceil2(c->total_band_count - (c->base_band_count + c->stereo_band_count),
|
||||
c->bands_per_hfr_group);
|
||||
|
||||
if (c->base_band_count + c->stereo_band_count + (unsigned long)c->hfr_group_count > 128ULL)
|
||||
if (c->base_band_count + c->stereo_band_count + (uint64_t)hfr_group_count > 128ULL)
|
||||
return AVERROR_INVALIDDATA;
|
||||
c->hfr_group_count = hfr_group_count;
|
||||
|
||||
for (int i = 0; i < avctx->ch_layout.nb_channels; i++) {
|
||||
c->ch[i].chan_type = r[i];
|
||||
|
Loading…
x
Reference in New Issue
Block a user