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

wined3d: Fix double free in geometry_shader_init. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2017-04-19 18:55:32 +02:00 committed by Alexandre Julliard
parent 20adccf866
commit 9b00f0182b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/wined3d/shader.c
View File

@ -3433,21 +3433,23 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3
const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc,
void *parent, const struct wined3d_parent_ops *parent_ops)
{
struct wined3d_stream_output_element *elements = NULL;
HRESULT hr;
if (so_desc && !(elements = wined3d_calloc(so_desc->element_count, sizeof(*elements))))
return E_OUTOFMEMORY;
if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops)))
{
HeapFree(GetProcessHeap(), 0, elements);
return hr;
}
if (so_desc)
{
struct wined3d_stream_output_desc *d = &shader->u.gs.so_desc;
*d = *so_desc;
if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements))))
{
wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader);
return E_OUTOFMEMORY;
}
memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements));
shader->u.gs.so_desc = *so_desc;
shader->u.gs.so_desc.elements = elements;
memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements));
}
return WINED3D_OK;