Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BROWSEUI] Fix early error handling, to be taken only when ParseNow() is run (and fixes "Use of uninitialized variable hr" RTC error).

Browse source 
Addendum to commit d8e47d61.
This commit is contained in:
Hermès Bélusca-Maïto 2021-09-17 18:58:07 +02:00
parent 6072ee9766
commit ffc4febb0c
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dll/win32/browseui/addresseditbox.cpp
View file

@ -168,8 +168,8 @@ cleanup:
if (pidlCurrent) if (pidlCurrent)
ILFree(pidlCurrent); ILFree(pidlCurrent);
if (address != input) if (address != input)
delete [] address; delete[] address;
delete [] input; delete[] input;
return hr; return hr;
} }
@ -192,19 +192,19 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC)
HRESULT hr; HRESULT hr;
/* /*
* Parse the path is it wasn't parsed * Parse the path if it wasn't parsed
*/ */
if (!pidlLastParsed) if (!pidlLastParsed)
{
hr = ParseNow(0); hr = ParseNow(0);
/* /* If the destination path doesn't exist then display an error message */
* If the destination path doesn't exist then display an error message
*/
if (hr == HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) if (hr == HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
return ShowFileNotFoundError(hr); return ShowFileNotFoundError(hr);
if (!pidlLastParsed) if (!pidlLastParsed)
return E_FAIL; return E_FAIL;
}
/* /*
* Get the IShellBrowser and IBrowserService interfaces of the shell browser * Get the IShellBrowser and IBrowserService interfaces of the shell browser