[PATCH] fix streams where SPS image size changes without refreshing PPS (#299)

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

diff --git a/libde265/decctx.cc b/libde265/decctx.cc
index 62cf20e537ed09e2e529f2496365f8232cdc4416..a962ea126520beafe8c439bb8d3df479a49bb272 100644 (file)
--- a/libde265/decctx.cc
+++ b/libde265/decctx.cc
@@ -562,6 +562,15 @@ de265_error decoder_context::read_sps_NAL(bitreader& reader)
 
   sps[ new_sps->seq_parameter_set_id ] = new_sps;
 
+  // Remove the all PPS that referenced the old SPS because parameters may have changed and we do not want to
+  // get the SPS and PPS parameters (e.g. image size) out of sync.
+  
+  for (auto& p : pps) {
+    if (p && p->seq_parameter_set_id == new_sps->seq_parameter_set_id) {
+      p = nullptr;
+    }
+  }
+
   return DE265_OK;
 }