evr/presenter: Fix a crash when releasing partially initialized object.

This happens when presenter is unable to create d3d device. Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

evr/presenter: Fix a crash when releasing partially initialized object.
3c1a02eb · Nikolay Sivov · Alexandre Julliard · 8c0c3d29 · 3c1a02eb
Commit 3c1a02eb authored Oct 29, 2021 by Nikolay Sivov Committed by Alexandre Julliard Oct 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

presenter.c dlls/evr/presenter.c +8 -2

No files found.
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -267,8 +267,11 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter)
        IMFMediaType_Release(presenter->media_type);
    presenter->media_type = NULL;

-    IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator);
-    video_presenter_set_allocator_callback(presenter, NULL);
+    if (presenter->allocator)
+    {
+        IMFVideoSampleAllocator_UninitializeSampleAllocator(presenter->allocator);
+        video_presenter_set_allocator_callback(presenter, NULL);
+    }
 }

 static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type)
@@ -2083,7 +2086,10 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out)
        goto failed;

    if (FAILED(hr = video_presenter_init_d3d(object)))
+    {
+        WARN("Failed to initialize d3d device, hr %#x.\n", hr);
        goto failed;
+    }

    *out = &object->IUnknown_inner;