diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-11-06 13:48:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-11-06 13:49:40 +0100 |
| commit | 5ffa0a4eab3bf13d52476b7549546c9028b11f88 (patch) | |
| tree | 432e924f9580501632f71df52f27aed32b018d65 | |
| parent | dc14c1f2316ccc47a2230c6c5b1c2a17e773facf (diff) | |
Try to ignore exceptions thrown from boost::filesystem::is_symlink (#1662).
Backported from c55763e650b12b96b97ef8630d3a5277c1237069 in v2.15.x.
| -rw-r--r-- | src/lib/film.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 0d2adce4a..167ffaf4e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -177,7 +177,8 @@ Film::Film (optional<boost::filesystem::path> dir) boost::filesystem::path result; for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) { if (*i == "..") { - if (boost::filesystem::is_symlink (result) || result.filename() == "..") { + boost::system::error_code ec; + if (boost::filesystem::is_symlink(result, ec) || result.filename() == "..") { result /= *i; } else { result = result.parent_path (); |
