From 0ef1bbb38cf187064e55bcab50de5012e502b3af Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 3 Feb 2018 21:24:30 -0800 Subject: [PATCH] [vcpkg] Fix crash when trying to enumerate nonexistent directory. --- toolsrc/src/vcpkg/base/files.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index 8c9e137ed..060a14da3 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -74,6 +74,7 @@ namespace vcpkg::Files std::error_code ec; fs::stdfs::recursive_directory_iterator b(dir, ec), e{}; + if (ec) return ret; for (; b != e; ++b) { ret.push_back(b->path()); @@ -86,7 +87,9 @@ namespace vcpkg::Files { std::vector ret; - fs::stdfs::directory_iterator b(dir), e{}; + std::error_code ec; + fs::stdfs::directory_iterator b(dir, ec), e{}; + if (ec) return ret; for (; b != e; ++b) { ret.push_back(b->path());