huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix GetDllDirectory on 2008 (#6066)

This commit is contained in:
Pavel Krymets 2018-12-20 16:02:04 -08:00 committed by GitHub
parent 45d1c054b2
commit d73d6e8546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/Environment.cpp
View File

@ -87,10 +87,21 @@ std::wstring Environment::GetCurrentDirectoryValue()
std::wstring Environment::GetDllDirectoryValue() std::wstring Environment::GetDllDirectoryValue()
{ {
// GetDllDirectory can return 0 in both the success case and the failure case, and it only sets last error when it fails.
// This requires you to set the last error to ERROR_SUCCESS before calling it in order to detect failure.
SetLastError(ERROR_SUCCESS);
DWORD requestedSize = GetDllDirectory(0, nullptr); DWORD requestedSize = GetDllDirectory(0, nullptr);
if (requestedSize == 0) if (requestedSize == 0)
{ {
throw std::system_error(GetLastError(), std::system_category(), "GetDllDirectory"); if (GetLastError() != ERROR_SUCCESS)
{
throw std::system_error(GetLastError(), std::system_category(), "GetDllDirectory");
}
else
{
return L"";
}
} }
std::wstring expandedStr; std::wstring expandedStr;
@ -99,7 +110,7 @@ std::wstring Environment::GetDllDirectoryValue()
expandedStr.resize(requestedSize); expandedStr.resize(requestedSize);
requestedSize = GetDllDirectory(requestedSize, expandedStr.data()); requestedSize = GetDllDirectory(requestedSize, expandedStr.data());
// 0 might be returned if GetDllDirectory is empty // 0 might be returned if GetDllDirectory is empty
if (requestedSize == 0 && GetLastError() != 0) if (requestedSize == 0 && GetLastError() != ERROR_SUCCESS)
{ {
throw std::system_error(GetLastError(), std::system_category(), "GetDllDirectory"); throw std::system_error(GetLastError(), std::system_category(), "GetDllDirectory");
} }