Commit 1cb43677 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi: Fix a couple of memory leaks (Valgrind).

parent 5277aa8f
......@@ -411,8 +411,7 @@ WCHAR *msi_resolve_source_folder( MSIPACKAGE *package, const WCHAR *name, MSIFOL
UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DWORD *sz)
{
MSIPACKAGE *package;
const WCHAR *path;
WCHAR *folderW;
WCHAR *path, *folderW;
UINT r;
TRACE("%s %p %p\n", debugstr_a(folder), buf, sz);
......@@ -459,6 +458,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW
else
r = ERROR_DIRECTORY;
heap_free(path);
heap_free(folderW);
msiobj_release(&package->hdr);
return r;
......@@ -470,7 +470,7 @@ UINT WINAPI MsiGetSourcePathA(MSIHANDLE hinst, const char *folder, char *buf, DW
UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf, DWORD *sz)
{
MSIPACKAGE *package;
const WCHAR *path;
WCHAR *path;
UINT r;
TRACE("%s %p %p\n", debugstr_w(folder), buf, sz);
......@@ -510,6 +510,7 @@ UINT WINAPI MsiGetSourcePathW(MSIHANDLE hinst, const WCHAR *folder, WCHAR *buf,
else
r = ERROR_DIRECTORY;
heap_free(path);
msiobj_release(&package->hdr);
return r;
}
......
......@@ -2125,6 +2125,7 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType,
ret = MSI_ProcessMessage( package, eMessageType, record );
msiobj_release( &record->hdr );
msiobj_release( &package->hdr );
return ret;
}
......@@ -2689,7 +2690,10 @@ UINT __cdecl s_remote_FormatRecord(MSIHANDLE hinst, struct wire_record *remote_r
{
*value = midl_user_allocate(++size * sizeof(WCHAR));
if (!*value)
{
MsiCloseHandle(rec);
return ERROR_OUTOFMEMORY;
}
r = MsiFormatRecordW(hinst, rec, *value, &size);
}
......
......@@ -141,9 +141,9 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U
old = sv->db->streams[row].stream;
hr = IStream_QueryInterface( new, &IID_IStream, (void **)&sv->db->streams[row].stream );
IStream_Release( new );
if (FAILED( hr ))
{
IStream_Release( new );
return ERROR_FUNCTION_FAILED;
}
if (old) IStream_Release( old );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment