From: jeanlf <jeanlf@gpac.io>
Date: Mon, 4 Jan 2021 10:06:52 +0000 (+0100)
Subject: [PATCH] fixed #1659
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-5+rpi1^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b4ec370671d234bdf590f7ce0d979151bcd90322;p=gpac.git

[PATCH] fixed #1659


Gbp-Pq: Name CVE-2020-35981.patch
---

diff --git a/src/isomedia/isom_store.c b/src/isomedia/isom_store.c
index 80a6b5c..54a6062 100644
--- a/src/isomedia/isom_store.c
+++ b/src/isomedia/isom_store.c
@@ -150,8 +150,14 @@ GF_Err SetupWriters(MovieWriter *mw, GF_List *writers, u8 interleaving)
 
 	trackCount = gf_list_count(movie->moov->trackList);
 	for (i = 0; i < trackCount; i++) {
+		GF_SampleTableBox *stbl;
 		trak = gf_isom_get_track(movie->moov, i+1);
 
+		stbl = (trak->Media && trak->Media->information) ? trak->Media->information->sampleTable : NULL;
+		if (!stbl || !stbl->SampleSize || !stbl->ChunkOffset || !stbl->SampleToChunk) {
+			return GF_ISOM_INVALID_FILE;
+		}
+
 		GF_SAFEALLOC(writer, TrackWriter);
 		if (!writer) goto exit;
 		writer->sampleNumber = 1;