Fix crash when loading DCPs whose ASSETMAP contains files that are

not mentioned in any PKL (#1855).

Back-ported from 4c8cc9e99678a4095772f283ffaaa1d6bd8aaf67 in master.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index 34000412..2011f04e 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -211,7 +211,12 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx
 			}
 		}
 
-		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;