Make sure err isn't nil when returning failure

jandubois · jandubois · commit 9be7f54c26e1 · 2024-11-06T21:18:09.000-08:00
Signed-off-by: Jan Dubois &lt;jan.dubois@suse.com&gt;
diff --git a/pkg/portfwd/listener_darwin.go b/pkg/portfwd/listener_darwin.go
@@ -69,7 +69,9 @@ func (p pseudoLoopbackListener) Accept() (net.Conn, error) {
 		return nil, err
 	}
 	if remoteAddrIP != "127.0.0.1" {
-		logrus.WithError(err).Debugf("pseudoloopback forwarder: rejecting non-loopback remoteAddr %q", remoteAddr)
+		err := fmt.Errorf("pseudoloopback forwarder: rejecting non-loopback remoteAddr %q", remoteAddr)
+		logrus.Debug(err)
+		conn.Close()
 		return nil, err
 	}
 	return conn, nil

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ func (p pseudoLoopbackListener) Accept() (net.Conn, error) {`
`69`	`69`	`return nil, err`
`70`	`70`	`}`
`71`	`71`	`if remoteAddrIP != "127.0.0.1" {`
`72`		`- logrus.WithError(err).Debugf("pseudoloopback forwarder: rejecting non-loopback remoteAddr %q", remoteAddr)`
	`72`	`+ err := fmt.Errorf("pseudoloopback forwarder: rejecting non-loopback remoteAddr %q", remoteAddr)`
	`73`	`+ logrus.Debug(err)`
	`74`	`+ conn.Close()`
`73`	`75`	`return nil, err`
`74`	`76`	`}`
`75`	`77`	`return conn, nil`