From a2b2cb7dcf51d6018854edf8509e5e292b5672fc Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sat, 24 Oct 2015 10:27:40 +0000 Subject: [PATCH] [SHELL32] Backport Wine commit: 0efa2331e2f54b81480adeb588972ca16a8dab16 "Fix a cloned pidl leak (Coverity)." by Nikolay Sivov CID 716480 svn path=/trunk/; revision=69674 --- reactos/dll/win32/shell32/shlfolder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/shell32/shlfolder.cpp b/reactos/dll/win32/shell32/shlfolder.cpp index 5aaaa14e076..f8380ea7ad2 100644 --- a/reactos/dll/win32/shell32/shlfolder.cpp +++ b/reactos/dll/win32/shell32/shlfolder.cpp @@ -664,15 +664,15 @@ HRESULT SHELL32_CompareIDs(IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pi 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)))) { -- 2.17.1