From: Carl Hetherington Date: Tue, 12 Nov 2019 22:58:50 +0000 (+0100) Subject: Fix crash when calling DCPContent::examine with no film. X-Git-Tag: v2.15.33 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f96413a2c0fb171d90e907d715a98224ba67021c Fix crash when calling DCPContent::examine with no film. --- diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 95f293b4d..d0f434e5a 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -180,6 +180,7 @@ DCPContent::read_sub_directory (boost::filesystem::path p) } } +/** @param film Film, or 0 */ void DCPContent::examine (shared_ptr film, shared_ptr job) { @@ -198,7 +199,7 @@ DCPContent::examine (shared_ptr film, shared_ptr job) } Content::examine (film, job); - shared_ptr examiner (new DCPExaminer(shared_from_this(), film->tolerant())); + shared_ptr examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true)); if (examiner->has_video()) { {