Add unit test to trigger #1275 and an assert to prevent the segfault.

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d6c3370b09cdfcb2d481f8d3aa737c0f311bf03b..d86a2ccf4ab032ba3a6d1f17ca232af7482bd02f 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -664,6 +664,8 @@ Writer::write (PlayerSubtitles subs, DCPTimePeriod period)
                ++_subtitle_reel;
        }
 
+       DCPOMATIC_ASSERT (_subtitle_reel != _reels.end());
+
        _subtitle_reel->write (subs);
 }
 

diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc
new file mode 100644 (file)
index 0000000..33bcf82
--- /dev/null
+++ b/test/subtitle_trim_test.cc
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "lib/film.h"
+#include "lib/dcp_subtitle_content.h"
+#include "test.h"
+#include <boost/test/unit_test.hpp>
+
+using boost::shared_ptr;
+
+/** Check for no crash when trimming DCP subtitles (#1275) */
+BOOST_AUTO_TEST_CASE (subtitle_trim_test1)
+{
+       shared_ptr<Film> film = new_test_film2 ("subtitle_trim_test1");
+       shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub5.xml"));
+       film->examine_and_add_content (content);
+       BOOST_REQUIRE (!wait_for_jobs ());
+
+       content->set_trim_end (ContentTime::from_seconds (2));
+       film->write_metadata ();
+
+       film->make_dcp ();
+       BOOST_REQUIRE (!wait_for_jobs ());
+}

diff --git a/test/wscript b/test/wscript
index fef16dbed71ec280bd2daabc8c496cdfaf54e47a..c50826ae90cca8ba0b82acf2fd919bcd6e65c58c 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -99,6 +99,7 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_reel_number_test.cc
+                 subtitle_trim_test.cc
                  test.cc
                  threed_test.cc
                  time_calculation_test.cc