James Hawkins : msi: Allow NULL parameters to be passed to the local MsiSetProperty.

Alexandre Julliard julliard at winehq.org
Thu Dec 20 06:21:44 CST 2007


Module: wine
Branch: master
Commit: 1d42de71ea9b2207d1960fa3deca04f1ad3c28f1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1d42de71ea9b2207d1960fa3deca04f1ad3c28f1

Author: James Hawkins <truiken at gmail.com>
Date:   Thu Dec 20 00:05:30 2007 -0600

msi: Allow NULL parameters to be passed to the local MsiSetProperty.

---

 dlls/msi/package.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 79c8764..a448214 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1345,7 +1345,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue
     if( !package )
     {
         HRESULT hr;
-        BSTR name, value;
+        BSTR name = NULL, value = NULL;
         IWineMsiRemotePackage *remote_package;
 
         remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall );
@@ -1354,7 +1354,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue
 
         name = SysAllocString( szName );
         value = SysAllocString( szValue );
-        if (!name || !value)
+        if ((!name && szName) || (!value && szValue))
         {
             SysFreeString( name );
             SysFreeString( value );




More information about the wine-cvs mailing list