ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Fix crash when calling MsiGetActiveDatabase with invalid remote handle.

This commit is contained in:
Octavian Voicu 2010-04-19 12:49:40 +03:00 committed by Alexandre Julliard
parent 1b4bacea8c
commit 9c892430ba
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/msi/package.c
View File

@ -1357,6 +1357,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall)
{ {
MSIPACKAGE *package; MSIPACKAGE *package;
MSIHANDLE handle = 0; MSIHANDLE handle = 0;
IUnknown *remote_unk;
IWineMsiRemotePackage *remote_package; IWineMsiRemotePackage *remote_package;
TRACE("(%d)\n",hInstall); TRACE("(%d)\n",hInstall);
@ -1367,10 +1368,19 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall)
handle = alloc_msihandle( &package->db->hdr ); handle = alloc_msihandle( &package->db->hdr );
msiobj_release( &package->hdr ); msiobj_release( &package->hdr );
} }
else if ((remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ))) else if ((remote_unk = msi_get_remote(hInstall)))
{ {
IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle); if (IUnknown_QueryInterface(remote_unk, &IID_IWineMsiRemotePackage,
IWineMsiRemotePackage_Release(remote_package); (LPVOID *)&remote_package) == S_OK)
{
IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle);
IWineMsiRemotePackage_Release(remote_package);
}
else
{
WARN("remote handle %d is not a package\n", hInstall);
}
IUnknown_Release(remote_unk);
} }
return handle; return handle;