diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-06-18 20:17:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-09-22 23:47:39 +0200 |
| commit | 3aff8503a9c8b52b001d932947e7ed80b9a775a2 (patch) | |
| tree | 5d932dd4a5ad5145607251075bac5ecf2d7dcc6f /libavformat/mov.c | |
| parent | 120f74650d924f37285c73c6a78c8fc775b00c09 (diff) | |
| download | ffmpeg-3aff8503a9c8b52b001d932947e7ed80b9a775a2.tar.gz | |
avformat/mov: Avoid cloning encryption info if its unchanged
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>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 93c1f9e929..1996e0028c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6499,9 +6499,12 @@ static int mov_read_sample_encryption_info(MOVContext *c, AVIOContext *pb, MOVSt return AVERROR_INVALIDDATA; } - *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); - if (!*sample) - return AVERROR(ENOMEM); + if (sc->cenc.per_sample_iv_size || use_subsamples) { + *sample = av_encryption_info_clone(sc->cenc.default_encrypted_sample); + if (!*sample) + return AVERROR(ENOMEM); + } else + *sample = NULL; if (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) { // Per-sample setting override. encrypted_sample = encryption_index->encrypted_samples[encrypted_index]; + if (!encrypted_sample) + encrypted_sample = sc->cenc.default_encrypted_sample; } else { av_log(mov->fc, AV_LOG_ERROR, "Incorrect number of samples in encryption info\n"); return AVERROR_INVALIDDATA; |