From 21653e2ecf7d3e5411db5b4313431696e3c409e3 Mon Sep 17 00:00:00 2001 From: alingse Date: Sat, 5 Apr 2025 22:50:30 +0800 Subject: [PATCH] fix wrong use a nil value error `err` (#3365) the `err` has been check abrove, so it is nil value, check the errWrite != nil, should return `.Base(errWrite)` --- transport/internet/websocket/dialer.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go index 5357971bb..3fb229fcd 100644 --- a/transport/internet/websocket/dialer.go +++ b/transport/internet/websocket/dialer.go @@ -164,7 +164,7 @@ func (d dialerWithEarlyData) Dial(earlyData []byte) (*websocket.Conn, error) { } if n != int64(len(earlyData)) { if errWrite := conn.WriteMessage(websocket.BinaryMessage, earlyData[n:]); errWrite != nil { - return nil, newError("failed to dial to (", d.uriBase, ") with early data as write of remainder early data failed: ").Base(err) + return nil, newError("failed to dial to (", d.uriBase, ") with early data as write of remainder early data failed: ").Base(errWrite) } } return conn, nil @@ -209,7 +209,7 @@ func (d dialerWithEarlyDataRelayed) Dial(earlyData []byte) (io.ReadWriteCloser, } if n != int64(len(earlyData)) { if _, errWrite := conn.Write(earlyData[n:]); errWrite != nil { - return nil, newError("failed to dial to (", d.uriBase, ") with early data as write of remainder early data failed: ").Base(err) + return nil, newError("failed to dial to (", d.uriBase, ") with early data as write of remainder early data failed: ").Base(errWrite) } } return conn, nil