commit 20c5746649f2d4051d05ea5ecd33d1c2b6fe504e
author Mike McCormack <mike@codeweavers.com> Wed May 24 17:41:04 2006 +0900
committer Alexandre Julliard <julliard@winehq.org> Wed May 24 10:52:33 2006 +0200
tree a23790c7f95b7b6cf8f06aa5fa64729ca92bbcd9
parent 9c018fd877a0bc28810c598d47b010dc0a728fe2

msi: Fix a possible memory leak.

dlls/msi/action.c

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 54a5b47..aaa5886 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2816,8 +2816,8 @@
     LPCWSTR buffer, extension;
     MSICOMPONENT *comp;
     static const WCHAR szlnk[]={'.','l','n','k',0};
-    IShellLinkW *sl;
-    IPersistFile *pf;
+    IShellLinkW *sl = NULL;
+    IPersistFile *pf = NULL;
     HRESULT res;
 
     buffer = MSI_RecordGetString(row,4);
@@ -2841,17 +2841,17 @@
     res = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
                     &IID_IShellLinkW, (LPVOID *) &sl );
 
-    if (FAILED(res))
+    if (FAILED( res ))
     {
-        ERR("Is IID_IShellLink\n");
-        return ERROR_SUCCESS;
+        ERR("CLSID_ShellLink not available\n");
+        goto err;
     }
 
     res = IShellLinkW_QueryInterface( sl, &IID_IPersistFile,(LPVOID*) &pf );
-    if( FAILED( res ) )
+    if (FAILED( res ))
     {
-        ERR("Is IID_IPersistFile\n");
-        return ERROR_SUCCESS;
+        ERR("QueryInterface(IID_IPersistFile) failed\n");
+        goto err;
     }
 
     buffer = MSI_RecordGetString(row,2);
@@ -2937,8 +2937,11 @@
 
     msi_free(target_file);    
 
-    IPersistFile_Release( pf );
-    IShellLinkW_Release( sl );
+err:
+    if (pf)
+        IPersistFile_Release( pf );
+    if (sl)
+        IShellLinkW_Release( sl );
 
     return ERROR_SUCCESS;
 }