other_mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-12-22 19:33:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(udp): check addr nil (close 1807)

Browse source
This commit is contained in:
ksco.he 2022-06-07 21:36:37 +08:00 committed by yuhan6665
parent b67314796f
commit 76638d793c
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
transport/internet/udp/hub_freebsd.go
View file

@ -8,6 +8,7 @@ import (
"encoding/gob" "encoding/gob"
"io" "io"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/transport/internet" "github.com/xtls/xray-core/transport/internet"
) )
@ -30,7 +31,14 @@ func ReadUDPMsg(conn *net.UDPConn, payload []byte, oob []byte) (int, int, int, *
nBytes, addr, err := conn.ReadFromUDP(payload) nBytes, addr, err := conn.ReadFromUDP(payload)
var buf bytes.Buffer var buf bytes.Buffer
enc := gob.NewEncoder(&buf) enc := gob.NewEncoder(&buf)
enc.Encode(conn.LocalAddr().(*net.UDPAddr)) udpAddr, ok := conn.LocalAddr().(*net.UDPAddr)
if !ok {
return 0, 0, 0, nil, errors.New("invalid local address")
}
if addr == nil {
return 0, 0, 0, nil, errors.New("invalid remote address")
}
enc.Encode(udpAddr)
enc.Encode(addr) enc.Encode(addr)
var reader io.Reader = &buf var reader io.Reader = &buf
noob, _ := reader.Read(oob) noob, _ := reader.Read(oob)