holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Make expression evaluation more deterministic.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-04 18:10:19 -08:00
parent 2fbbc70e83
commit c61c9ba7eb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1943,10 +1943,16 @@ sub evaluate_expression( $$$ ) {
$val = ( exists $variables{$var} ? $variables{$var} :
exists $actparms{$var} ? ( $var ? $actparms{$var} : $actparms{0}->{name} ) :
exists $capdesc{$var} ? have_capability( $var ) : 0 );
$val = 0 unless defined $val;
$val = "'$val'" unless $val =~ /^-?\d+$/;
$expression = join( '', $first, $val || 0, $rest );
exists $capdesc{$var} ? have_capability( $var ) : '' );
$val = '' unless defined $val;
if ( $val eq '' ) {
$val = "''" unless $first =~ /['"]$/;
} else {
$val = "'$val'" unless $val =~ /^-?\d+$/;
}
$expression = join( '', $first, $val, $rest );
cond_error( "Variable Expansion Loop" , $filename, $linenumber ) if ++$count > 100;
}
@ -1967,12 +1973,13 @@ sub evaluate_expression( $$$ ) {
cond_error "Unknown capability ($cap)", $filename, $linenumber;
}
$expression = join( '', $first, $val || 0, $rest );
$expression = join( '', $first, $val, $rest );
}
$expression =~ s/^\s*(.+)\s*$/$1/;
unless ( $expression =~ /^\d+$/ ) {
print "EXPR=> $expression\n" if $debug;
#
# Not a simple one-term expression -- compile it
#