From 296b0727822c2a96a718804e8d3a9131da8a66c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Mon, 16 Feb 2015 22:40:15 +0000 Subject: [PATCH] [RSHELL] - Fix use after free (and spanish style issues ;-) ) svn path=/trunk/; revision=66329 --- reactos/base/shell/rshell/CMergedFolder.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/reactos/base/shell/rshell/CMergedFolder.cpp b/reactos/base/shell/rshell/CMergedFolder.cpp index 2d63e52ea0d..82ccf865e0c 100644 --- a/reactos/base/shell/rshell/CMergedFolder.cpp +++ b/reactos/base/shell/rshell/CMergedFolder.cpp @@ -225,17 +225,15 @@ HRESULT CEnumMergedFolder::Begin(HWND hwndOwner, SHCONTF flags) int order = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, pInfo->parseName, lstrlenW(pInfo->parseName), info.parseName, lstrlenW(info.parseName)); - switch (order) + + if (order == CSTR_EQUAL) { - case CSTR_EQUAL: TRACE("Item name already exists! Marking '%S' as shared ...\n", name); bShared = TRUE; pInfo->shared = TRUE; pInfo->pidl2 = info.pidl; CoTaskMemFree(name); break; - default: - continue; } } @@ -815,4 +813,4 @@ HRESULT STDMETHODCALLTYPE CMergedFolder::QueryNameSpace2(ULONG, QUERYNAMESPACEIN { UNIMPLEMENTED; return E_NOTIMPL; -} \ No newline at end of file +}