diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-29 01:19:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-29 01:19:44 +0000 |
| commit | 2e9744b7c79a0e56193b48bd0760a7b989f06079 (patch) | |
| tree | bfaa9be8f61eb3afbb48959c695cd0392f65c942 /src/lib/dcp_content.cc | |
| parent | 641a81bf7ad436853525d734c0d41a0f1365ecd3 (diff) | |
Don't crash when loading DCPs with multiple CCAP assets per reel (part of #1516).v2.13.140
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 4c4486a28..ef877a17f 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -225,7 +225,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); for (int i = 0; i < TEXT_COUNT; ++i) { - if (examiner->has_text(static_cast<TextType>(i))) { + for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) { text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i)))); } } |