fix: return typed nil from TCPConn Local|RemoteAddr()

spikecurtis · spikecurtis · commit 41481bedfff6 · 2025-12-03T08:28:48.000Z
diff --git a/pkg/tcpip/adapters/gonet/gonet.go b/pkg/tcpip/adapters/gonet/gonet.go
@@ -445,7 +445,7 @@ func (c *TCPConn) CloseWrite() error {
 func (c *TCPConn) LocalAddr() net.Addr {
 	a, err := c.ep.GetLocalAddress()
 	if err != nil {
-		return nil
+		return (*net.TCPAddr)(nil)
 	}
 	return fullToTCPAddr(a)
 }
@@ -454,7 +454,7 @@ func (c *TCPConn) LocalAddr() net.Addr {
 func (c *TCPConn) RemoteAddr() net.Addr {
 	a, err := c.ep.GetRemoteAddress()
 	if err != nil {
-		return nil
+		return (*net.TCPAddr)(nil)
 	}
 	return fullToTCPAddr(a)
 }

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ func (c *TCPConn) CloseWrite() error {`
`445`	`445`	`func (c *TCPConn) LocalAddr() net.Addr {`
`446`	`446`	`a, err := c.ep.GetLocalAddress()`
`447`	`447`	`if err != nil {`
`448`		`- return nil`
	`448`	`+ return (*net.TCPAddr)(nil)`
`449`	`449`	`}`
`450`	`450`	`return fullToTCPAddr(a)`
`451`	`451`	`}`
`@@ -454,7 +454,7 @@ func (c *TCPConn) LocalAddr() net.Addr {`
`454`	`454`	`func (c *TCPConn) RemoteAddr() net.Addr {`
`455`	`455`	`a, err := c.ep.GetRemoteAddress()`
`456`	`456`	`if err != nil {`
`457`		`- return nil`
	`457`	`+ return (*net.TCPAddr)(nil)`
`458`	`458`	`}`
`459`	`459`	`return fullToTCPAddr(a)`
`460`	`460`	`}`