mf: Handle null marker context for sample grabber stream.

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

mf: Handle null marker context for sample grabber stream.
a12b5fe0 · Nikolay Sivov · Alexandre Julliard · 73a6470d · a12b5fe0
Commit a12b5fe0 authored Apr 24, 2020 by Nikolay Sivov Committed by Alexandre Julliard Apr 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

samplegrabber.c dlls/mf/samplegrabber.c +4 -2

No files found.
--- a/dlls/mf/samplegrabber.c
+++ b/dlls/mf/samplegrabber.c
@@ -446,7 +446,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_
        const PROPVARIANT *context_value)
 {
    struct scheduled_item *item;
-    HRESULT hr;
+    HRESULT hr = S_OK;
    if (list_empty(&grabber->items))
    {
@@ -460,7 +460,9 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_
    item->type = ITEM_TYPE_MARKER;
    item->u.marker.type = marker_type;
    list_init(&item->entry);
-    hr = PropVariantCopy(&item->u.marker.context, context_value);
+    PropVariantInit(&item->u.marker.context);
+    if (context_value)
+        hr = PropVariantCopy(&item->u.marker.context, context_value);
    if (SUCCEEDED(hr))
        list_add_tail(&grabber->items, &item->entry);
    else