[PATCH 5/5] ddraw: Avoid accessing free'd memory on an error path in ddraw_surface_create().
Henri Verbeet
hverbeet at codeweavers.com
Tue Jun 7 14:18:37 CDT 2016
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/surface.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index d36afe7..1cbd6c3 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -5754,10 +5754,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
if (desc->dwFlags & DDSD_BACKBUFFERCOUNT)
{
WARN("Tried to specify a back buffer count for a non-flippable surface.\n");
+ hr = desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP ? DDERR_INVALIDPARAMS : DDERR_INVALIDCAPS;
HeapFree(GetProcessHeap(), 0, texture);
- if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
- return DDERR_INVALIDPARAMS;
- return DDERR_INVALIDCAPS;
+ return hr;
}
}
--
2.1.4
More information about the wine-patches
mailing list