summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-10-10 18:58:05 +0200
committerCarl Hetherington <cth@carlh.net>2020-10-10 18:58:05 +0200
commit4c8cc9e99678a4095772f283ffaaa1d6bd8aaf67 (patch)
tree31d52c150ead202b1c5801591b655e7009963404 /src
parentb4e1d9fffeb3a834e30ec13bbd467cecd88f87f9 (diff)
Fix crash when loading DCPs whose ASSETMAP contains files that are
not mentioned in any PKL (#1855).
Diffstat (limited to 'src')
-rw-r--r--src/dcp.cc7
1 files changed, 6 insertions, 1 deletions
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;