dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs().

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs().
ba4ee497 · Zhiyi Zhang · Alexandre Julliard · 23a8887d · ba4ee497 · ba4ee497
Commit ba4ee497 authored Feb 20, 2020 by Zhiyi Zhang Committed by Alexandre Julliard Feb 20, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

adapter.c dlls/dxgi/adapter.c +3 -0

dxgi.c dlls/dxgi/tests/dxgi.c +3 -0

No files found.
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -128,6 +128,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac

    TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output);

+    if (!output)
+        return E_INVALIDARG;
+
    if (output_idx > 0)
    {
        *output = NULL;

--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -1175,6 +1175,9 @@ static void test_output(void)
    hr = IDXGIDevice_GetAdapter(device, &adapter);
    ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);

+    hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
    hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output);
    if (hr == DXGI_ERROR_NOT_FOUND)
    {