RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mov: Avoid cloning encryption info if its unchanged

Browse Source 
Fixes: OOM
Fixes: 45834/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5419540462305280

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-06-18 20:17:51 +02:00
parent 120f74650d
commit 3aff8503a9
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mov.c
View File

@ -6499,9 +6499,12 @@ static int mov_read_sample_encryption_info(MOVContext *c, AVIOContext *pb, MOVSt
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
*sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); if (sc->cenc.per_sample_iv_size || use_subsamples) {
if (!*sample) *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample);
return AVERROR(ENOMEM); if (!*sample)
return AVERROR(ENOMEM);
} else
*sample = NULL;
if (sc->cenc.per_sample_iv_size != 0) { if (sc->cenc.per_sample_iv_size != 0) {
if ((ret = ffio_read_size(pb, (*sample)->iv, sc->cenc.per_sample_iv_size)) < 0) { if ((ret = ffio_read_size(pb, (*sample)->iv, sc->cenc.per_sample_iv_size)) < 0) {
@ -7420,6 +7423,8 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa
} else if (encrypted_index >= 0 && encrypted_index < encryption_index->nb_encrypted_samples) { } else if (encrypted_index >= 0 && encrypted_index < encryption_index->nb_encrypted_samples) {
// Per-sample setting override. // Per-sample setting override.
encrypted_sample = encryption_index->encrypted_samples[encrypted_index]; encrypted_sample = encryption_index->encrypted_samples[encrypted_index];
if (!encrypted_sample)
encrypted_sample = sc->cenc.default_encrypted_sample;
} else { } else {
av_log(mov->fc, AV_LOG_ERROR, "Incorrect number of samples in encryption info\n"); av_log(mov->fc, AV_LOG_ERROR, "Incorrect number of samples in encryption info\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;