A few small fixes.

d5bfaf78 · Aric Stewart · Alexandre Julliard · c5a1443f · d5bfaf78
Commit d5bfaf78 authored May 18, 2005 by Aric Stewart Committed by Alexandre Julliard May 18, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cond.y dlls/msi/cond.y +4 -2

No files found.
--- 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;