Add an extra test to prevent 'PBD::path_is_within()' from looping infinitely on Windows

[ardour.git] / libs / pbd / file_utils.cc

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 89f6818704c9d8c05d0ad2dc7c668cadc8e2d05d..9523fdd6bdbd5bd7d6379146d574daa7fe556aef 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -54,6 +54,7 @@
 #include "pbd/debug.h"
 #include "pbd/error.h"
 #include "pbd/pathexpand.h"
+#include "pbd/scoped_file_descriptor.h"
 #include "pbd/stl_delete.h"
 
 #include "i18n.h"
@@ -281,8 +282,8 @@ copy_file(const std::string & from_path, const std::string & to_path)
 {
        if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false;
 
-       int fd_from (::open (from_path.c_str(), O_RDONLY));
-       int fd_to (::open (to_path.c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
+       PBD::ScopedFileDescriptor fd_from (::open (from_path.c_str(), O_RDONLY));
+       PBD::ScopedFileDescriptor fd_to (::open (to_path.c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
 
        char buf[4096]; // BUFSIZ  ??
        ssize_t nread;
@@ -378,7 +379,7 @@ path_is_within (std::string const & haystack, std::string needle)
                }
 
                needle = Glib::path_get_dirname (needle);
-               if (needle == "." || needle == "/") {
+               if (needle == "." || needle == "/" || Glib::path_skip_root(needle).empty()) {
                        break;
                }
        }