From d9217570cba82d13088bd323377866ffa2d6b379 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Mon, 9 May 2016 08:12:00 +0000 Subject: [PATCH] [SHELL32] - Fix uninitialized return value in _SHGetDefaultValue. CID 1322231 CORE-11213 #resolve svn path=/trunk/; revision=71295 --- reactos/dll/win32/shell32/wine/shellpath.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reactos/dll/win32/shell32/wine/shellpath.c b/reactos/dll/win32/shell32/wine/shellpath.c index f26dd49c101..c65ac4ed476 100644 --- a/reactos/dll/win32/shell32/wine/shellpath.c +++ b/reactos/dll/win32/shell32/wine/shellpath.c @@ -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); } } -- 2.17.1