dxva2: Limit allowed number of substreams in CreateVideoProcessor().

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

dxva2: Limit allowed number of substreams in CreateVideoProcessor().
8c9418fb · Nikolay Sivov · Alexandre Julliard · ef584679 · 8c9418fb · 8c9418fb
Commit 8c9418fb authored Nov 02, 2021 by Nikolay Sivov Committed by Alexandre Julliard Nov 02, 2021
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

main.c dlls/dxva2/main.c +6 -0

dxva2.c dlls/dxva2/tests/dxva2.c +0 -2

No files found.
--- a/dlls/dxva2/main.c
+++ b/dlls/dxva2/main.c
@@ -496,6 +496,12 @@ static HRESULT WINAPI device_manager_processor_service_CreateVideoProcessor(IDir

    /* FIXME: validate render target format */

+    if (max_substreams >= 16)
+    {
+        WARN("Invalid substreams count %u.\n", max_substreams);
+        return E_INVALIDARG;
+    }
+
    if (!(object = heap_alloc_zero(sizeof(*object))))
        return E_OUTOFMEMORY;


--- a/dlls/dxva2/tests/dxva2.c
+++ b/dlls/dxva2/tests/dxva2.c
@@ -470,9 +470,7 @@ static void test_video_processor(void)
    /* Number of substreams does not include reference stream. */
    hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc,
            D3DFMT_A8R8G8B8, 16, &processor);
-todo_wine
    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
-    if (SUCCEEDED(hr)) IDirectXVideoProcessor_Release(processor);

    hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcSoftwareDevice, &video_desc,
            D3DFMT_A8R8G8B8, 15, &processor);