Fix crash when calling DCPContent::examine with no film. v2.15.33
authorCarl Hetherington <cth@carlh.net>
Tue, 12 Nov 2019 22:58:50 +0000 (23:58 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 12 Nov 2019 22:58:50 +0000 (23:58 +0100)
src/lib/dcp_content.cc

index 95f293b4d3ef894f1cfd50529716c30a17aa42cc..d0f434e5a87af1e0b0da304ca73c136620c7623e 100644 (file)
@@ -180,6 +180,7 @@ DCPContent::read_sub_directory (boost::filesystem::path p)
        }
 }
 
+/** @param film Film, or 0 */
 void
 DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
@@ -198,7 +199,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
        }
        Content::examine (film, job);
 
-       shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant()));
+       shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true));
 
        if (examiner->has_video()) {
                {