[EXPLORER] Registry key not closed on error (#3136)

CORE-14519
2026-07-07 00:44:22 +08:00 · 2020-09-08 21:55:45 +02:00
parent 2c7ccf4bc9
commit d54e50f3dc
1 changed files with 3 additions and 2 deletions
--- a/base/shell/explorer/shellservice.cpp
+++ b/base/shell/explorer/shellservice.cpp
@@ -115,17 +115,18 @@ HRESULT InitShellServices(HDPA * phdpa)
        goto cleanup;
    }

-    RegCloseKey(hkey);
-
    /* Initialize */
    DPA_EnumCallback(hdpa, InitializeAllCallback, &hr);
    if (FAILED_UNEXPECTEDLY(hr))
        goto cleanup;

+    RegCloseKey(hkey);
+
    *phdpa = hdpa;
    return count > 0 ? S_OK : S_FALSE;

 cleanup:
+    RegCloseKey(hkey);
    *phdpa = NULL;
    ShutdownShellServices(hdpa);
    return hr;