Alistair Leslie-Hughes : d3d11: Check parameter in ID3D11Device CreateShaderResourceView.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 576395c71f018ba7421fb56a777f2aea88a38f89
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=576395c71f018ba7421fb56a77...

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Mon Nov 28 06:42:56 2016 +0000

d3d11: Check parameter in ID3D11Device CreateShaderResourceView.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 1cb033d..fd51aa2 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -2186,6 +2186,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev
 
     TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
 
+    if (!resource)
+        return E_INVALIDARG;
+
     if (FAILED(hr = d3d_shader_resource_view_create(device, resource, desc, &object)))
         return hr;
 
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 496b715..515cd02 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -3283,6 +3283,9 @@ static void test_create_shader_resource_view(void)
     U(srv_desc).Buffer.ElementOffset = 0;
     U(srv_desc).Buffer.ElementWidth = 64;
 
+    hr = ID3D11Device_CreateShaderResourceView(device, NULL, &srv_desc, &srview);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
     expected_refcount = get_refcount((IUnknown *)device) + 1;
     hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview);
     ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr);