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

Save/Restore $current_param in process_inline()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-03-12 16:39:08 -08:00
parent df5f34951c
commit c36cee28fb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -2930,8 +2930,6 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
# process_inline() will call process_rule() recursively for each rule in the macro body
#
fatal_error "Macro/Inline invocations nested too deeply" if ++$macro_nest_level > MAX_MACRO_NEST_LEVEL;
$current_param = $param unless $param eq '' || $param eq 'PARAM';
#
# Push the current column array onto the column stack
#
@ -2943,6 +2941,10 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
$actionresult = 0;
my $save_current_param = $current_param;
$current_param = $param;
my $generated = process_inline( $basictarget,
$chainref,
$rule . $raw_matches,
@ -2968,6 +2970,8 @@ sub process_rule ( $$$$$$$$$$$$$$$$$$$$ ) {
( $actionresult, @columns ) = @{pop @columnstack};
$current_param = $save_current_param;
$macro_nest_level--;
return $generated;