[PATCH] fixed #1876

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

diff --git a/src/filters/isoffin_read.c b/src/filters/isoffin_read.c
index 2c216b8a20d797c654df479d0c87288de49ac18b..19b4ab9f8dcf80b5340af111e085578e1336a5ce 100644 (file)
--- a/src/filters/isoffin_read.c
+++ b/src/filters/isoffin_read.c
@@ -1296,6 +1296,13 @@ static GF_Err isoffin_process(GF_Filter *filter)
                                        gf_filter_pid_set_eos(ch->pid);
                                }
                                break;
+                       } else if (ch->last_state==GF_ISOM_INVALID_FILE) {
+                               if (!ch->eos_sent) {
+                                       ch->eos_sent = GF_TRUE;
+                                       read->eos_signaled = GF_TRUE;
+                                       gf_filter_pid_set_eos(ch->pid);
+                               }
+                               return ch->last_state;
                        } else {
                                read->force_fetch = GF_TRUE;
                                break;

diff --git a/src/filters/isoffin_read_ch.c b/src/filters/isoffin_read_ch.c
index 59866ad3e1a7a7f3e0632535fd6e67106ecd7812..b5e0df314dadf96f5b5997544a17eceb22a289b8 100644 (file)
--- a/src/filters/isoffin_read_ch.c
+++ b/src/filters/isoffin_read_ch.c
@@ -364,6 +364,10 @@ void isor_reader_get_sample(ISOMChannel *ch)
                                if (!ch->has_edit_list && ch->sample_num)
                                        ch->sample_num--;
                        } else {
+                               if (ch->to_init && ch->sample_num) {
+                                       GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Failed to fetch initial sample %d for track %d\n"));
+                                       ch->last_state = GF_ISOM_INVALID_FILE;
+                               }
                                if (ch->sample_num >= gf_isom_get_sample_count(ch->owner->mov, ch->track)) {
                                        ch->last_state = GF_EOS;
                                }