From 6626ef06fb9779f36c69cb70d75996efbc05ea3f Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 6 Apr 2011 10:10:42 -0700
Subject: [PATCH] Fix yet another optimizer bug

---
 Shorewall/Perl/Shorewall/Chains.pm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index c1e7b11d2..870c25c5b 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -1667,13 +1667,14 @@ sub delete_references( $ ) {
 #
 sub replace_references( $$ ) {
     my ( $chainref, $target ) = @_;
-    my $tableref = $chain_table{$chainref->{table}};
-    my $count    = 0;
-    my $name     = $chainref->{name};
+    my $tableref  = $chain_table{$chainref->{table}};
+    my $count     = 0;
+    my $name      = $chainref->{name};
+    my $targetref = $tableref->{$target};
 
     $name =~ s/\+/\\+/;
 
-    if ( ! $tableref->{$target}{builtin} ) {
+    if ( $targetref ) {
 	#
 	# The target is a chain -- use the jump type from each referencing rule
 	#
@@ -1683,7 +1684,7 @@ sub replace_references( $$ ) {
 		for ( @{$fromref->{rules}} ) {
 		    $rule++;
 		    if ( s/ -([jg]) $name(\s|$)/ -$1 ${target}$2/ ) {
-			add_reference ( $fromref, $tableref->{$target} );
+			add_reference ( $fromref, $targetref );
 			$count++;
 			trace( $fromref, 'R', $rule, $_ ) if $debug;
 		    }
@@ -1693,7 +1694,7 @@ sub replace_references( $$ ) {
 	    }
 	}
 
-	delete $tableref->{$target}{references}{$chainref->{name}};
+	delete $targetref->{references}{$chainref->{name}};
     } else {
 	#
 	# The target is a builtin -- we must use '-j'
@@ -1704,7 +1705,6 @@ sub replace_references( $$ ) {
 		for ( @{$fromref->{rules}} ) {
 		    $rule++;
 		    if ( s/ -[jg] $name(\s|$)/ -j ${target}$1/ ) {
-			add_reference ( $fromref, $tableref->{$target} );
 			$count++ ;
 			trace( $fromref, 'R', $rule, $_ ) if $debug;
 		    }
@@ -1713,8 +1713,6 @@ sub replace_references( $$ ) {
 		delete $chainref->{references}{$fromref->{name}};
 	    }
 	}
-
-	delete $tableref->{$target}{references}{$chainref->{name}};
     }
 
     progress_message "  $count references to chain $chainref->{name} replaced" if $count;