wbemdisp: Fix a crash on null interface pointer.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wbemdisp: Fix a crash on null interface pointer.
1fda7ca7 · Nikolay Sivov · Alexandre Julliard · a1ee6fa8 · 1fda7ca7 · 1fda7ca7
Commit 1fda7ca7 authored Jul 15, 2016 by Nikolay Sivov Committed by Alexandre Julliard Jul 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 1 deletion

locator.c dlls/wbemdisp/locator.c +2 -1

wbemdisp.c dlls/wbemdisp/tests/wbemdisp.c +14 -0

No files found.
--- a/dlls/wbemdisp/locator.c
+++ b/dlls/wbemdisp/locator.c
@@ -1224,7 +1224,8 @@ static ULONG WINAPI locator_Release(
    if (!refs)
    {
        TRACE( "destroying %p\n", locator );
-        IWbemLocator_Release( locator->locator );
+        if (locator->locator)
+            IWbemLocator_Release( locator->locator );
        heap_free( locator );
    }
    return refs;

--- a/dlls/wbemdisp/tests/wbemdisp.c
+++ b/dlls/wbemdisp/tests/wbemdisp.c
@@ -243,9 +243,23 @@ static void test_ParseDisplayName(void)
    IParseDisplayName_Release( displayname );
 }

+static void test_locator(void)
+{
+    IUnknown *locator;
+    HRESULT hr;
+
+    hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&locator );
+    ok( hr == S_OK, "got %x\n", hr );
+
+    IUnknown_Release( locator );
+}
+
 START_TEST(wbemdisp)
 {
    CoInitialize( NULL );
+
    test_ParseDisplayName();
+    test_locator();
+
    CoUninitialize();
 }