extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-24 00:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid a call to eval() for simple expressions

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-07-06 07:26:54 -07:00
parent e9d8228b6f
commit 83df8a4e39
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1708,11 +1708,23 @@ sub evaluate_expression( $$$ ) {
$expression = join( '', $first, $val, $rest ); $expression = join( '', $first, $val, $rest );
} }
my $val = eval qq(package Shorewall::User;\nuse strict;\n# line $linenumber "$filename"\n$expression); my $val;
unless ( $val ) { if ( $expression =~ /^\s*(\d+)\s*$/ || $expression =~ /\s*'(.*?)'\s*$/ ) {
cond_error( "Couldn't parse expression: $@" , $filename, $linenumber ) if $@; #
cond_error( "Undefined expression" , $filename, $linenumber ) unless defined $val; # Simple one-term expression -- don't compile it
#
$val = $1;
} else {
#
# Not a simple one-term expression
#
$val = eval qq(package Shorewall::User;\nuse strict;\n# line $linenumber "$filename"\n$expression);
unless ( $val ) {
cond_error( "Couldn't parse expression: $@" , $filename, $linenumber ) if $@;
cond_error( "Undefined expression" , $filename, $linenumber ) unless defined $val;
}
} }
$val; $val;