Author: pschweitzer
Date: Sat Oct 24 10:27:40 2015
New Revision: 69674
URL:
http://svn.reactos.org/svn/reactos?rev=69674&view=rev
Log:
[SHELL32]
Backport Wine commit: 0efa2331e2f54b81480adeb588972ca16a8dab16
"Fix a cloned pidl leak (Coverity)." by Nikolay Sivov
CID 716480
Modified:
trunk/reactos/dll/win32/shell32/shlfolder.cpp
Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Oct 24 10:27:40 2015
@@ -664,15 +664,15 @@
if (isEmpty1 && isEmpty2)
{
- return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0);
+ nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, 0 );
}
else if (isEmpty1)
{
- return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (WORD) -1);
+ nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, (WORD)-1 );
}
else if (isEmpty2)
{
- return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 1);
+ nReturn = MAKE_HRESULT( SEVERITY_SUCCESS, 0, 1 );
/* optimizing end */
}
else if (SUCCEEDED(iface->BindToObject(firstpidl, NULL, IID_PPV_ARG(IShellFolder,
&psf)))) {