ddraw: Avoid accessing free'd memory on an error path in ddraw_surface_create().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw: Avoid accessing free'd memory on an error path in ddraw_surface_create().
2afd2f70 · Henri Verbeet · Alexandre Julliard · 62e25379 · 2afd2f70
Commit 2afd2f70 authored Jun 07, 2016 by Henri Verbeet Committed by Alexandre Julliard Jun 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

surface.c dlls/ddraw/surface.c +2 -3

No files found.
--- 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;
        }
    }