api/types/network: Port,PortRange: don't panic on zero values

thaJeztah · thaJeztah · commit 4c24542e9598 · 2026-03-14T00:51:53.000+01:00
- Prevent panic when calling .Proto() on zero values
- Don't iterate on zero-value port-ranges

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/api/types/network/port.go b/api/types/network/port.go
@@ -79,6 +79,9 @@ func (p Port) Num() uint16 {
 
 // Proto returns p's network protocol.
 func (p Port) Proto() IPProtocol {
+	if p.proto == protoZero {
+		return ""
+	}
 	return p.proto.Value()
 }
 
@@ -232,6 +235,9 @@ func (pr PortRange) End() uint16 {
 
 // Proto returns pr's network protocol.
 func (pr PortRange) Proto() IPProtocol {
+	if pr.proto == protoZero {
+		return ""
+	}
 	return pr.proto.Value()
 }
 
@@ -307,6 +313,9 @@ func (pr PortRange) Range() PortRange {
 //	}
 func (pr PortRange) All() iter.Seq[Port] {
 	return func(yield func(Port) bool) {
+		if pr.proto == protoZero {
+			return
+		}
 		for i := uint32(pr.Start()); i <= uint32(pr.End()); i++ {
 			if !yield(Port{num: uint16(i), proto: pr.proto}) {
 				return
diff --git a/api/types/network/port_test.go b/api/types/network/port_test.go
@@ -25,6 +25,9 @@ func TestPort(t *testing.T) {
 		assert.Check(t, p.IsZero())
 		assert.Check(t, !p.IsValid())
 		assert.Equal(t, p.String(), "invalid port")
+		assert.Equal(t, p.Proto(), IPProtocol(""))
+		assert.Equal(t, p.Num(), uint16(0))
+		assert.Equal(t, p.Range(), PortRange{})
 
 		t.Run("Marshal Unmarshal", func(t *testing.T) {
 			var p Port
@@ -266,6 +269,11 @@ func TestPortRange(t *testing.T) {
 		assert.Check(t, pr.IsZero())
 		assert.Check(t, !pr.IsValid())
 		assert.Equal(t, pr.String(), "invalid port range")
+		assert.Equal(t, pr.Start(), uint16(0))
+		assert.Equal(t, pr.End(), uint16(0))
+		assert.Equal(t, pr.Proto(), IPProtocol(""))
+		assert.Equal(t, pr.Range(), pr)
+		assert.Check(t, slices.Equal(slices.Collect(pr.All()), []Port{}))
 
 		t.Run("Marshal Unmarshal", func(t *testing.T) {
 			var pr PortRange
@@ -515,7 +523,7 @@ func TestPortRange(t *testing.T) {
 				want: []Port{portFrom(1000, TCP), portFrom(1001, TCP), portFrom(1002, TCP)},
 			},
 			{
-				in:   "0-0/tcp",
+				in:   "0-0/tcp", // TODO(thaJeztah): should this result in "zero-value range" and an empty list?
 				want: []Port{portFrom(0, TCP)},
 			},
 			{
diff --git a/vendor/github.com/moby/moby/api/types/network/port.go b/vendor/github.com/moby/moby/api/types/network/port.go
