ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10core: Don't use potentially uninitialized data in the depth/stencil state key (Valgrind).

This commit is contained in:
Henri Verbeet 2015-04-28 20:30:54 +02:00 committed by Alexandre Julliard
parent da24b51139
commit 0a12107604
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3d10core/device.c
View File

@ -1744,6 +1744,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi
{ {
struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_device *device = impl_from_ID3D10Device(iface);
struct d3d10_depthstencil_state *object; struct d3d10_depthstencil_state *object;
D3D10_DEPTH_STENCIL_DESC tmp_desc;
struct wine_rb_entry *entry; struct wine_rb_entry *entry;
HRESULT hr; HRESULT hr;
@ -1752,7 +1753,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi
if (!desc) if (!desc)
return E_INVALIDARG; return E_INVALIDARG;
if ((entry = wine_rb_get(&device->depthstencil_states, desc))) /* D3D10_DEPTH_STENCIL_DESC has a hole, which is a problem because we use
* it as a key in the rbtree. */
memset(&tmp_desc, 0, sizeof(tmp_desc));
tmp_desc.DepthEnable = desc->DepthEnable;
tmp_desc.DepthWriteMask = desc->DepthWriteMask;
tmp_desc.DepthFunc = desc->DepthFunc;
tmp_desc.StencilEnable = desc->StencilEnable;
tmp_desc.StencilReadMask = desc->StencilReadMask;
tmp_desc.StencilWriteMask = desc->StencilWriteMask;
tmp_desc.FrontFace = desc->FrontFace;
tmp_desc.BackFace = desc->BackFace;
if ((entry = wine_rb_get(&device->depthstencil_states, &tmp_desc)))
{ {
object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_depthstencil_state, entry); object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_depthstencil_state, entry);
@ -1767,7 +1780,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi
if (!object) if (!object)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
if (FAILED(hr = d3d10_depthstencil_state_init(object, device, desc))) if (FAILED(hr = d3d10_depthstencil_state_init(object, device, &tmp_desc)))
{ {
WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); WARN("Failed to initialize depthstencil state, hr %#x.\n", hr);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);