[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 80a6b5c87469188557ea94eb52551477d6619100..54a606242d9903116d2db304b693176aeff6f4f1 100644 (file)
--- 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;