fix infinity recursion in Equal while findrules

singchia · Feb 18, 2024 · 9b675dd · 9b675dd
1 parent bf53b93
commit 9b675dd
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/ebtables/match.go b/ebtables/match.go
@@ -179,7 +179,10 @@ func (bm *baseMatch) Parse(params []byte) (int, bool) {
 }
 
 func (bm *baseMatch) Equal(mth Match) bool {
-	return bm.Short() == mth.Short()
+	if bm.child != nil {
+		return bm.child.Short() == mth.Short()
+	}
+	return false
 }
 
 func (bm *baseMatch) Depends() []MatchType {

diff --git a/ebtables/option.go b/ebtables/option.go
@@ -80,7 +80,10 @@ func (bo *baseOption) LongArgs() []string {
 }
 
 func (bo *baseOption) Equal(opt Option) bool {
-	return bo.Short() == opt.Short()
+	if bo.child != nil {
+		return bo.child.Short() == opt.Short()
+	}
+	return false
 }
 
 // Use a file lock to support concurrent scripts updating the

diff --git a/ebtables/target.go b/ebtables/target.go
@@ -175,7 +175,10 @@ func (bt *baseTarget) Parse([]byte) (int, bool) {
 }
 
 func (bt *baseTarget) Equal(tgt Target) bool {
-	return bt.Short() == tgt.Short()
+	if bt.child != nil {
+		return bt.child.Short() == tgt.Short()
+	}
+	return false
 }
 
 type TargetEmpty struct {

diff --git a/ebtables/watcher.go b/ebtables/watcher.go
@@ -87,7 +87,10 @@ func (bw *baseWatcher) LongArgs() []string {
 }
 
 func (bw *baseWatcher) Equal(wth Watcher) bool {
-	return bw.Short() == wth.Short()
+	if bw.child != nil {
+		return bw.child.Short() == wth.Short()
+	}
+	return false
 }
 
 type OptionWatcherLog func(*WatcherLog)

diff --git a/iptables/match.go b/iptables/match.go
@@ -480,7 +480,10 @@ func (bm *baseMatch) Depends() []MatchType {
 }
 
 func (bm *baseMatch) Equal(mth Match) bool {
-	return bm.Short() == mth.Short()
+	if bm.child != nil {
+		return bm.child.Short() == mth.Short()
+	}
+	return false
 }
 
 type MatchIPv4 struct {

diff --git a/iptables/option.go b/iptables/option.go
@@ -74,7 +74,10 @@ func (bo *baseOption) LongArgs() []string {
 }
 
 func (bo *baseOption) Equal(opt Option) bool {
-	return bo.Short() == opt.Short()
+	if bo.child != nil {
+		return bo.child.Short() == opt.Short()
+	}
+	return false
 }
 
 type OptionFragment struct {

diff --git a/iptables/target.go b/iptables/target.go
@@ -422,7 +422,10 @@ func (bt *baseTarget) Parse([]byte) (int, bool) {
 }
 
 func (bt *baseTarget) Equal(tgt Target) bool {
-	return bt.Short() == tgt.Short()
+	if bt.child != nil {
+		return bt.child.Short() == tgt.Short()
+	}
+	return false
 }
 
 type TargetEmpty struct {