[jgardou] 66329: [RSHELL] - Fix use after free (and spanish style issues ; -) )

Author: jgardou
Date: Mon Feb 16 22:40:15 2015
New Revision: 66329

URL: http://svn.reactos.org/svn/reactos?rev=66329&view=rev
Log:
[RSHELL]
 - Fix use after free (and spanish style issues ;-) )

Modified:
    trunk/reactos/base/shell/rshell/CMergedFolder.cpp

Modified: trunk/reactos/base/shell/rshell/CMergedFolder.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMergedF…
==============================================================================
--- trunk/reactos/base/shell/rshell/CMergedFolder.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/rshell/CMergedFolder.cpp	[iso-8859-1] Mon Feb 16 22:40:15
2015
@@ -225,17 +225,15 @@
             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 @@
 {
     UNIMPLEMENTED;
     return E_NOTIMPL;
-}
+}