From 7c020facc3813381a59568d29f60f930366a4436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zef=20Kucia?= Date: Thu, 20 Jul 2017 14:11:02 +0200 Subject: [PATCH] d3d11: Fix race condition in d3d_rasterizer_state_create(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spotted by Kimmo Myllyvirta. Signed-off-by: Józef Kucia Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d11/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 110d04e886c..87fed6f822b 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1042,7 +1042,6 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); state->desc = *desc; @@ -1050,7 +1049,6 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str { ERR("Failed to insert rasterizer state entry.\n"); wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); return E_FAIL; } @@ -1064,10 +1062,8 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); wine_rb_remove(&device->rasterizer_states, &state->entry); - wined3d_mutex_unlock(); return hr; } - wined3d_mutex_unlock(); ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); @@ -1096,12 +1092,16 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE return S_OK; } - wined3d_mutex_unlock(); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + wined3d_mutex_unlock(); return E_OUTOFMEMORY; + } - if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) + hr = d3d_rasterizer_state_init(object, device, desc); + wined3d_mutex_unlock(); + if (FAILED(hr)) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object);