Fix crashes when using kdm_cli with a certificate instead of a cinema.
authorCarl Hetherington <cth@carlh.net>
Mon, 10 Jan 2022 19:44:55 +0000 (20:44 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 10 Jan 2022 19:44:55 +0000 (20:44 +0100)
src/tools/dcpomatic_kdm_cli.cc

index d0b60366b2cfe78fbd3a3ba88d75cec21596ee28..5f12e3f96b6fc27d262bb7fbdfd59a09fdb29a05 100644 (file)
@@ -335,6 +335,12 @@ from_dkdm (
                                continue;
                        }
 
+                       int const offset_hour = i->cinema ? i->cinema->utc_offset_hour() : 0;
+                       int const offset_minute = i->cinema ? i->cinema->utc_offset_minute() : 0;
+
+                       dcp::LocalTime begin(valid_from, offset_hour, offset_minute);
+                       dcp::LocalTime end(valid_to, offset_hour, offset_minute);
+
                        screen_kdms.push_back (
                                ScreenKDM (
                                        i,
@@ -342,8 +348,8 @@ from_dkdm (
                                                dkdm,
                                                i->recipient.get(),
                                                i->trusted_device_thumbprints(),
-                                               dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-                                               dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+                                               begin,
+                                               end,
                                                formulation,
                                                disable_forensic_marking_picture,
                                                disable_forensic_marking_audio