averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Fix resolvePathSymlinks

Browse Source 
The llvm::ArrayRef constructor should be passed the actual length of the
resulting string, not MAX_PATH, else the StringRef that results has an
incorrect length of MAX_PATH.
This commit is contained in:
Gwen Mittertreiner
2019-05-07 17:24:11 -07:00
parent f70c41b0de
commit 77c26874d1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
View File

@@ -861,17 +861,17 @@ std::string SwiftLangSupport::resolvePathSymlinks(StringRef FilePath) {
if (fileHandle == INVALID_HANDLE_VALUE)
return InputPath;
bool success = GetFinalPathNameByHandleW(fileHandle, full_path, MAX_PATH,
DWORD numChars = GetFinalPathNameByHandleW(fileHandle, full_path, MAX_PATH,
FILE_NAME_NORMALIZED);
CloseHandle(fileHandle);
std::string utf8Path;
if (success) {
if (numChars > 0 && numChars <= MAX_PATH) {
llvm::ArrayRef<char> pathRef((const char *)full_path,
(const char *)(full_path + MAX_PATH));
success &= llvm::convertUTF16ToUTF8String(pathRef, utf8Path);
(const char *)(full_path + numChars));
return llvm::convertUTF16ToUTF8String(pathRef, utf8Path) ? utf8Path
: InputPath;
}
return (success ? utf8Path : InputPath);
return InputPath;
#endif
}