From: Carl Hetherington <cth@carlh.net>
Date: Mon, 8 Aug 2022 21:20:48 +0000 (+0200)
Subject: Fix crashes when the find-missing code finds an inacessible directory (#2291).
X-Git-Tag: v2.16.20~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=0664b92293ec8dd4fec4015981af7610a9e1984c

Fix crashes when the find-missing code finds an inacessible directory (#2291).
---

diff --git a/src/lib/find_missing.cc b/src/lib/find_missing.cc
index 3d61e74bd..2234637b3 100644
--- a/src/lib/find_missing.cc
+++ b/src/lib/find_missing.cc
@@ -37,7 +37,8 @@ static
 void
 search (Replacements& replacement_paths, boost::filesystem::path directory, int depth = 0)
 {
-	for (auto candidate: boost::filesystem::directory_iterator(directory)) {
+	boost::system::error_code ec;
+	for (auto candidate: boost::filesystem::directory_iterator(directory, ec)) {
 		if (boost::filesystem::is_regular_file(candidate.path())) {
 			for (auto& replacement: replacement_paths) {
 				for (auto& path: replacement.second) {
@@ -50,6 +51,10 @@ search (Replacements& replacement_paths, boost::filesystem::path directory, int
 			search (replacement_paths, candidate, depth + 1);
 		}
 	}
+
+	/* Just ignore errors when creating the directory_iterator; they can be triggered by things like
+	 * macOS' love of creating random directories (see #2291).
+	 */
 }