d3drm: Fix leakage of pData2 on error.

fe339ba2 · Christian Costa · Alexandre Julliard · ccb38b2d · fe339ba2
Commit fe339ba2 authored Mar 09, 2012 by Christian Costa Committed by Alexandre Julliard Mar 13, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

meshbuilder.c dlls/d3drm/meshbuilder.c +3 -3

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