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

Correct an optimization bug involving empty/unreferenced chains

Browse Source
This commit is contained in:
Tom Eastep 2011-02-03 09:12:50 -08:00
parent 98ad7e15b0
commit d68d40ee1c
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -1153,20 +1153,28 @@ sub delete_jumps ( $$ ) {
my $from = $fromref->{name}; my $from = $fromref->{name};
my $rules = $fromref->{rules}; my $rules = $fromref->{rules};
my $refs = $toref->{references}{$from}; my $refs = $toref->{references}{$from};
#
# A C-style for-loop with indexing seems to work best here, given that we are
# deleting elements from the array over which we are iterating.
#
for ( my $rule = 0; $rule <= $#{$rules}; $rule++ ) {
if ( $rules->[$rule] =~ / -[gj] ${to}(\s+-m comment .*)?\s*$/ ) {
trace( $fromref, 'D', $rule + 1, $rules->[$rule] ) if $debug;
splice( @$rules, $rule, 1 );
last unless --$refs > 0;
$rule--;
}
}
assert( ! $refs ); #
# The 'from' chain may have had no references and has already been deleted so
# we need to check
#
if ( $fromref->{referenced} ) {
#
#
# A C-style for-loop with indexing seems to work best here, given that we are
# deleting elements from the array over which we are iterating.
#
for ( my $rule = 0; $rule <= $#{$rules}; $rule++ ) {
if ( $rules->[$rule] =~ / -[gj] ${to}(\s+-m comment .*)?\s*$/ ) {
trace( $fromref, 'D', $rule + 1, $rules->[$rule] ) if $debug;
splice( @$rules, $rule, 1 );
last unless --$refs > 0;
$rule--;
}
}
assert( ! $refs );
}
delete $toref->{references}{$from}; delete $toref->{references}{$from};