[PATCH 5/9] d3drm: Fix leakage of pData2 on error.

Christian Costa titan.costa at gmail.com
Fri Mar 9 04:55:37 CST 2012


---
 dlls/d3drm/meshbuilder.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 8dd172e..bbe84ac 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -1159,10 +1159,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
 
         hr = IDirectXFileData_GetType(pData2, &pGuid);
         if (hr != DXFILE_OK)
-        {
-            IDirectXFileData_Release(pData2);
             goto end;
-        }
 
         TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid));
 
@@ -1206,11 +1203,14 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3*
         }
 
         IDirectXFileData_Release(pData2);
+        pData2 = NULL;
     }
 
     ret = D3DRM_OK;
 
 end:
+    if (pData2)
+        IDirectXFileData_Release(pData2);
     if (pData)
         IDirectXFileData_Release(pData);
     if (pEnumObject)




More information about the wine-patches mailing list