Mike McCormack : msi: Check the right pointers for NULL.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 1aba0d62c676f8e3158e02e5b236ecef133eaf15
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1aba0d62c676f8e3158e02e5...

Author: Mike McCormack <mike(a)codeweavers.com>
Date:   Tue Jul 18 18:43:03 2006 +0900

msi: Check the right pointers for NULL.

---

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

diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index e075c0e..11e552a 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -471,7 +471,7 @@ UINT WINAPI MSI_GetProductInfo(LPCWSTR s
      * FIXME: Values seem scattered/duplicated in the registry. Is there a system?
      */
 
-    if ((szValue && !pcchValueBuf) || !szProduct || !szAttribute)
+    if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szAttribute)
         return ERROR_INVALID_PARAMETER;
 
     /* check for special properties */
@@ -990,11 +990,11 @@ INSTALLSTATE WINAPI MSI_GetComponentPath
     LPWSTR path = NULL;
 
     TRACE("%s %s %p %p\n", debugstr_w(szProduct),
-           debugstr_w(szComponent), lpPathBuf, pcchBuf);
+           debugstr_w(szComponent), lpPathBuf->str.w, pcchBuf);
 
-    if( !szComponent )
+    if( !szProduct || !szComponent )
         return INSTALLSTATE_INVALIDARG;
-    if( lpPathBuf && !pcchBuf )
+    if( lpPathBuf->str.w && !pcchBuf )
         return INSTALLSTATE_INVALIDARG;
 
     if (!squash_guid( szProduct, squished_pc ) ||