From: Carl Hetherington <cth@carlh.net>
Date: Mon, 2 Dec 2013 09:19:12 +0000 (+0000)
Subject: Fix crash on failing to open a frame info file.
X-Git-Tag: v2.0.48~1097
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=da0138e1d48cb5fb82dec53c4e76f22e5c395e61

Fix crash on failing to open a frame info file.
---

diff --git a/ChangeLog b/ChangeLog
index c579b6804..51e56cbce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-12-02  Carl Hetherington  <cth@carlh.net>
 
+	* Fix crash on checking non-existing frame info
+	files.
+
 	* Fix erroneous disabling of timing panel with
 	audio-only sources.
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index f4128e6c5..60b2a47ab 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -432,6 +432,11 @@ Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 {
 	/* Read the frame info as written */
 	FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r");
+	if (!ifi) {
+		_film->log()->log (String::compose ("Existing frame %1 has no info file", f));
+		return false;
+	}
+	
 	libdcp::FrameInfo info (ifi);
 	fclose (ifi);
 	if (info.size == 0) {