diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-03-15 19:25:47 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2013-03-15 19:25:47 +0000 |
| commit | d932d41190adfa1842ff8bd10b78eba29862df79 (patch) | |
| tree | 63431e7192054d3feac751a44c30b7af289fe1b2 | |
| parent | 0de53f062ff8fa581c8d59b1a108b0cdfbd8060f (diff) | |
| download | bcm5719-llvm-d932d41190adfa1842ff8bd10b78eba29862df79.tar.gz bcm5719-llvm-d932d41190adfa1842ff8bd10b78eba29862df79.zip | |
[Support][Path][Windows] Fix dangling else. Don't call CloseHandle when CloseFD is false.
llvm-svn: 177175
| -rw-r--r-- | llvm/lib/Support/Windows/PathV2.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/llvm/lib/Support/Windows/PathV2.inc b/llvm/lib/Support/Windows/PathV2.inc index 0f657bf3b95..23f3d14f91f 100644 --- a/llvm/lib/Support/Windows/PathV2.inc +++ b/llvm/lib/Support/Windows/PathV2.inc @@ -715,10 +715,10 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { FileDescriptor = FD; // Make sure that the requested size fits within SIZE_T. if (Size > std::numeric_limits<SIZE_T>::max()) { - if (FileDescriptor) + if (FileDescriptor) { if (CloseFD) _close(FileDescriptor); - else + } else ::CloseHandle(FileHandle); return make_error_code(errc::invalid_argument); } @@ -739,10 +739,10 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { 0); if (FileMappingHandle == NULL) { error_code ec = windows_error(GetLastError()); - if (FileDescriptor) + if (FileDescriptor) { if (CloseFD) _close(FileDescriptor); - else + } else ::CloseHandle(FileHandle); return ec; } @@ -762,10 +762,10 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { if (Mapping == NULL) { error_code ec = windows_error(GetLastError()); ::CloseHandle(FileMappingHandle); - if (FileDescriptor) + if (FileDescriptor) { if (CloseFD) _close(FileDescriptor); - else + } else ::CloseHandle(FileHandle); return ec; } @@ -777,10 +777,10 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { error_code ec = windows_error(GetLastError()); ::UnmapViewOfFile(Mapping); ::CloseHandle(FileMappingHandle); - if (FileDescriptor) + if (FileDescriptor) { if (CloseFD) _close(FileDescriptor); - else + } else ::CloseHandle(FileHandle); return ec; } @@ -790,10 +790,10 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) { // Close all the handles except for the view. It will keep the other handles // alive. ::CloseHandle(FileMappingHandle); - if (FileDescriptor) + if (FileDescriptor) { if (CloseFD) _close(FileDescriptor); // Also closes FileHandle. - else + } else ::CloseHandle(FileHandle); return error_code::success(); } |
