From 7b0f3762827b6ec57287a00aafed0ca8a01410f8 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 28 Nov 2016 06:43:08 +0000 Subject: [PATCH] d3d11: Check parameter in ID3D11Device CreateRenderTargetView. Signed-off-by: Alistair Leslie-Hughes Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d11/device.c | 3 +++ dlls/d3d11/tests/d3d11.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fd51aa203dd..19c55ff94e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2223,6 +2223,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + if (!resource) + return E_INVALIDARG; + if (FAILED(hr = d3d_rendertarget_view_create(device, resource, desc, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 515cd027dcc..703800f44b8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2979,6 +2979,9 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Buffer.ElementOffset = 0; U(rtv_desc).Buffer.ElementWidth = 64; + hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)buffer, &rtv_desc, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr);