From: jeanlf <jeanlf@gpac.io>
Date: Mon, 5 Jul 2021 14:50:03 +0000 (+0200)
Subject: [PATCH] fixed #1840
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1+deb11u3^2~92
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19738ad7440276733f759984e8bdb5969fdad192;p=gpac.git

[PATCH] fixed #1840


Gbp-Pq: Name CVE-2021-36414.patch
---

diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
index f4c565c..9ec3c37 100644
--- a/src/isomedia/isom_write.c
+++ b/src/isomedia/isom_write.c
@@ -6449,7 +6449,11 @@ GF_Err gf_isom_set_ctts_v1(GF_ISOFile *file, u32 track, u32 ctts_shift)
 	if (!trak) return GF_BAD_PARAM;
 
 	ctts = trak->Media->information->sampleTable->CompositionOffset;
-	shift = ctts->version ? ctts_shift : ctts->entries[0].decodingOffset;
+	if (ctts->version) {
+		shift = ctts_shift;
+	} else {
+		shift = ctts->nb_entries ? ctts->entries[0].decodingOffset : 0;
+	}
 	leastCTTS = GF_INT_MAX;
 	greatestCTTS = 0;
 	for (i=0; i<ctts->nb_entries; i++) {
diff --git a/src/isomedia/media.c b/src/isomedia/media.c
index 064299f..8570df8 100644
--- a/src/isomedia/media.c
+++ b/src/isomedia/media.c
@@ -99,7 +99,7 @@ static GF_Err gf_isom_get_3gpp_audio_esd(GF_SampleTableBox *stbl, u32 type, GF_G
 		memset(szName, 0, 80);
 		strcpy(szName, "QCELP-13K(GPAC-emulated)");
 		gf_bs_write_data(bs, szName, 80);
-		ent = &stbl->TimeToSample->entries[0];
+		ent = stbl->TimeToSample->nb_entries ? &stbl->TimeToSample->entries[0] : NULL;
 		sample_rate = entry->samplerate_hi;
 		block_size = ent ? ent->sampleDelta : 160;
 		gf_bs_write_u16_le(bs, 8*sample_size*sample_rate/block_size);