Commit d5bfaf78 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

A few small fixes.

parent c5a1443f
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment