From 4408c5abc643bdbd2041f41eff955f2cc34f9d4e Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Tue, 18 Oct 2011 20:46:12 +0200
Subject: [PATCH] ddraw: Clear attached_iface before releasing it in
 ddraw_surface_delete_attached_surface().

Spotted by Dan Kegel / Valgrind.
---
 dlls/ddraw/surface.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index a67380679e3..c01ac455c29 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1590,8 +1590,12 @@ static HRESULT ddraw_surface_delete_attached_surface(IDirectDrawSurfaceImpl *Thi
         IDirect3DDeviceImpl_UpdateDepthStencil(This->ddraw->d3ddevice);
     }
     LeaveCriticalSection(&ddraw_cs);
-    IUnknown_Release(Surf->attached_iface);
+
+    /* Set attached_iface to NULL before releasing it, the surface may go
+     * away. */
     Surf->attached_iface = NULL;
+    IUnknown_Release(detach_iface);
+
     return DD_OK;
 }