[SHELL32]

- Fix uninitialized return value in _SHGetDefaultValue. CID 1322231
CORE-11213 #resolve

svn path=/trunk/; revision=71295
This commit is contained in:
Thomas Faber 2016-05-09 08:12:00 +00:00
parent 8a8de70eb2
commit d9217570cb

View file

@ -1518,6 +1518,7 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
; /* no corresponding env. var, do nothing */
}
hr = S_OK;
if (CSIDL_Data[folder].szDefaultPath)
{
if (IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath))
@ -1525,7 +1526,6 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
if (LoadStringW(shell32_hInstance,
LOWORD(CSIDL_Data[folder].szDefaultPath), resourcePath, MAX_PATH))
{
hr = S_OK;
PathAppendW(pszPath, resourcePath);
}
else
@ -1537,7 +1537,6 @@ static HRESULT _SHGetDefaultValue(HANDLE hToken, BYTE folder, LPWSTR pszPath)
}
else
{
hr = S_OK;
PathAppendW(pszPath, CSIDL_Data[folder].szDefaultPath);
}
}