From 4c8cc9e99678a4095772f283ffaaa1d6bd8aaf67 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 10 Oct 2020 18:58:05 +0200
Subject: Fix crash when loading DCPs whose ASSETMAP contains files that are
 not mentioned in any PKL (#1855).

---
 src/dcp.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/dcp.cc b/src/dcp.cc
index b00a6a19..381adde4 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -213,7 +213,12 @@ DCP::read (list<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_mxf
 			}
 		}
 
-		DCP_ASSERT (pkl_type);
+		if (!pkl_type) {
+			/* This asset is in the ASSETMAP but not mentioned in any PKL so we don't
+			 * need to worry about it.
+			 */
+			continue;
+		}
 
 		if (*pkl_type == CPL::static_pkl_type(*_standard) || *pkl_type == InteropSubtitleAsset::static_pkl_type(*_standard)) {
 			xmlpp::DomParser* p = new xmlpp::DomParser;
-- 
cgit v1.2.3