From d5bfaf7897013579d9d9658fe688fd873734249a Mon Sep 17 00:00:00 2001
From: Aric Stewart <aric@codeweavers.com>
Date: Wed, 18 May 2005 17:46:38 +0000
Subject: [PATCH] A few small fixes.

---
 dlls/msi/cond.y | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index 4a7f46d86ed..96905f40e3b 100644
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -181,7 +181,7 @@ term:
         }
   | value_s
         {
-            $$ = $1[0] ? MSICONDITION_TRUE : MSICONDITION_FALSE;
+            $$ = ($1 && $1[0]) ? MSICONDITION_TRUE : MSICONDITION_FALSE;
         }
   | value_i comp_op_i value_i
         {
@@ -739,7 +739,9 @@ MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *package, LPCWSTR szCondition )
     
     TRACE("Evaluating %s\n",debugstr_w(szCondition));    
 
-    if( szCondition && !COND_parse( &cond ) )
+    if ( szCondition == NULL || szCondition[0] == 0)
+    	r = MSICONDITION_NONE;
+    else if ( !COND_parse( &cond ) )
         r = cond.result;
     else
         r = MSICONDITION_ERROR;
-- 
2.11.4.GIT