Fix a race condition in llvm::sys::path::unique_file: when we end up

failing to create the unique file because the path doesn't exist,
don't fail if someone else manages to create the path before we do.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172032 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Douglas Gregor 2013-01-10 01:58:46 +00:00
parent b11f050434
commit 06c7008e30

View File

@ -421,11 +421,12 @@ retry_random_path:
rety_open_create: rety_open_create:
int RandomFD = ::open(RandomPath.c_str(), O_RDWR | O_CREAT | O_EXCL, mode); int RandomFD = ::open(RandomPath.c_str(), O_RDWR | O_CREAT | O_EXCL, mode);
if (RandomFD == -1) { if (RandomFD == -1) {
int SavedErrno = errno;
// If the file existed, try again, otherwise, error. // If the file existed, try again, otherwise, error.
if (errno == errc::file_exists) if (SavedErrno == errc::file_exists)
goto retry_random_path; goto retry_random_path;
// If path prefix doesn't exist, try to create it. // If path prefix doesn't exist, try to create it.
if (errno == errc::no_such_file_or_directory && if (SavedErrno == errc::no_such_file_or_directory &&
!exists(path::parent_path(RandomPath))) { !exists(path::parent_path(RandomPath))) {
StringRef p(RandomPath); StringRef p(RandomPath);
SmallString<64> dir_to_create; SmallString<64> dir_to_create;
@ -440,13 +441,15 @@ rety_open_create:
(*i)[1] == '/' && (*i)[1] == '/' &&
(*i)[2] != '/') (*i)[2] != '/')
return make_error_code(errc::no_such_file_or_directory); return make_error_code(errc::no_such_file_or_directory);
if (::mkdir(dir_to_create.c_str(), 0700) == -1) if (::mkdir(dir_to_create.c_str(), 0700) == -1 &&
errno != errc::file_exists)
return error_code(errno, system_category()); return error_code(errno, system_category());
} }
} }
goto rety_open_create; goto rety_open_create;
} }
return error_code(errno, system_category());
return error_code(SavedErrno, system_category());
} }
// Make the path absolute. // Make the path absolute.