fix: handle nil pointer stored in non-nil interface (#2337)

2025-12-19 00:10:06 +08:00 · 2025-11-02 20:02:16 +08:00 · 2025-11-02 20:02:16 +08:00 · 6fb1f796a5
commit 6fb1f796a5
parent 99e68e9983
2 changed files with 8 additions and 3 deletions
--- a/adapter/outbound/shadowsocksr.go
+++ b/adapter/outbound/shadowsocksr.go
@ -252,13 +252,14 @@ func (spc *ssrPacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr
 		return nil, nil, nil, errors.New("parse addr error")
 	}

-	addr = _addr.UDPAddr()
-	if addr == nil {
+	udpAddr := _addr.UDPAddr()
+	if udpAddr == nil {
 		if put != nil {
 			put()
 		}
 		return nil, nil, nil, errors.New("parse addr error")
 	}
+	addr = udpAddr

 	data = data[len(_addr):]
 	return
--- a/transport/trojan/trojan.go
+++ b/transport/trojan/trojan.go
@ -183,7 +183,11 @@ func (pc *PacketConn) WaitReadFrom() (data []byte, put func(), addr net.Addr, er
 	if err != nil {
 		return nil, nil, nil, err
 	}
-	addr = destination.UDPAddr()
+	udpAddr := destination.UDPAddr()
+	if udpAddr == nil {
+		return nil, nil, nil, errors.New("parse addr error")
+	}
+	addr = udpAddr

 	data = pool.Get(pool.UDPBufferSize)
 	put = func() {