From 196de029044f4dbac5f74f68e08a89f778c3a236 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 23 Dec 2018 21:38:44 +0000
Subject: Be a bit more careful with fwrite.

---
 src/lib/config.cc      |  6 +-----
 src/lib/internet.cc    |  3 ++-
 src/lib/reel_writer.cc |  6 +++---
 src/lib/util.cc        | 17 +++++++++++++++++
 src/lib/util.h         |  1 +
 src/lib/writer.cc      |  2 +-
 6 files changed, 25 insertions(+), 10 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 172890dcf..eb2671365 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -987,11 +987,7 @@ Config::write_config () const
 		if (!f) {
 			throw FileError (_("Could not open file for writing"), cf);
 		}
-		size_t const w = fwrite (s.c_str(), 1, s.length(), f);
-		if (w != s.length()) {
-			fclose (f);
-			throw FileError (_("Could not write whole file"), cf);
-		}
+		checked_fwrite (s.c_str(), s.length(), f, cf);
 		fclose (f);
 	} catch (xmlpp::exception& e) {
 		string s = e.what ();
diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index ad313bd3f..4eba1efa3 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -22,6 +22,7 @@
 #include "compose.hpp"
 #include "exceptions.h"
 #include "cross.h"
+#include "util.h"
 #include <curl/curl.h>
 #include <zip.h>
 #include <boost/function.hpp>
@@ -140,7 +141,7 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
 	char buffer[4096];
 	while (true) {
 		int const N = zip_fread (file_in_zip, buffer, sizeof (buffer));
-		fwrite (buffer, 1, N, f);
+		checked_fwrite (buffer, N, f, temp_cert.file());
 		if (N < int (sizeof (buffer))) {
 			break;
 		}
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index f645d6eb5..e34874a14 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -143,9 +143,9 @@ ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
 		throw OpenFileError (info_file, errno, read);
 	}
 	dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET);
-	fwrite (&info.offset, sizeof (info.offset), 1, file);
-	fwrite (&info.size, sizeof (info.size), 1, file);
-	fwrite (info.hash.c_str(), 1, info.hash.size(), file);
+	checked_fwrite (&info.offset, sizeof (info.offset), file, info_file);
+	checked_fwrite (&info.size, sizeof (info.size), file, info_file);
+	checked_fwrite (info.hash.c_str(), info.hash.size(), file, info_file);
 	fclose (file);
 }
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 5eba8d73a..595c7e76e 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -783,14 +783,31 @@ increment_eyes (Eyes e)
 	return EYES_LEFT;
 }
 
+void
+checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path)
+{
+	size_t N = fwrite (ptr, 1, size, stream);
+	if (N != size) {
+		if (ferror(stream)) {
+			fclose (stream);
+			throw FileError (String::compose("fwrite error %1", errno), path);
+		} else {
+			fclose (stream);
+			throw FileError ("Unexpected short write", path);
+		}
+	}
+}
+
 void
 checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path path)
 {
 	size_t N = fread (ptr, 1, size, stream);
 	if (N != size) {
 		if (ferror(stream)) {
+			fclose (stream);
 			throw FileError (String::compose("fread error %1", errno), path);
 		} else {
+			fclose (stream);
 			throw FileError ("Unexpected short read", path);
 		}
 	}
diff --git a/src/lib/util.h b/src/lib/util.h
index f62b2c492..94e9e3761 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -99,5 +99,6 @@ extern std::pair<int, int> audio_channel_types (std::list<int> mapped, int chann
 extern boost::shared_ptr<AudioBuffers> remap (boost::shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping map);
 extern Eyes increment_eyes (Eyes e);
 extern void checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path path);
+extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path);
 
 #endif
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index c31ae2a91..45a74624f 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -634,7 +634,7 @@ Writer::write_cover_sheet ()
 
 	boost::algorithm::replace_all (text, "$LENGTH", length);
 
-	fwrite (text.c_str(), 1, text.length(), f);
+	checked_fwrite (text.c_str(), text.length(), f, cover);
 	fclose (f);
 }
 
-- 
cgit v1.2.3