diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-03-12 22:32:39 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-03-12 22:32:39 +0000 |
| commit | 56772ebe9a5ce3585d2d5cdca3fa1e7fcb29405d (patch) | |
| tree | eb3cac54979a7177ec6138d0cf1bc8b15d184e86 | |
| parent | 14891447fff5b9a5980c1728fbe15140b6350ae3 (diff) | |
[Support][Path] Don't inf loop if creating the parent directory fails.
Patch by Paul Robinson.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176908 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Support/Windows/PathV2.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/Support/Windows/PathV2.inc b/lib/Support/Windows/PathV2.inc index 2e6cc96e7f..823f7583da 100644 --- a/lib/Support/Windows/PathV2.inc +++ b/lib/Support/Windows/PathV2.inc @@ -593,6 +593,10 @@ retry_random_path: random_path_utf16.push_back(0); random_path_utf16.pop_back(); + // Make sure we don't fall into an infinite loop by constantly trying + // to create the parent path. + bool TriedToCreateParent = false; + // Try to create + open the path. retry_create_file: HANDLE TempFileHandle = ::CreateFileW(random_path_utf16.begin(), @@ -610,7 +614,9 @@ retry_create_file: if (ec == windows_error::file_exists) goto retry_random_path; // Check for non-existing parent directories. - if (ec == windows_error::path_not_found) { + if (ec == windows_error::path_not_found && !TriedToCreateParent) { + TriedToCreateParent = true; + // Create the directories using result_path as temp storage. if (error_code ec = UTF16ToUTF8(random_path_utf16.begin(), random_path_utf16.size(), result_path)) |