xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: handle parse socks5 udp address properly (#2220)

Browse source
This commit is contained in:
Kaming Chan 2022-07-25 12:44:00 +08:00 committed by GitHub
parent 93400cf44d
commit bec4df7b12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
transport/snell/snell.go
View file

@ -241,6 +241,9 @@ func ReadPacket(r io.Reader, payload []byte) (net.Addr, int, error) {
return nil, 0, errors.New("remote address invalid") return nil, 0, errors.New("remote address invalid")
} }
uAddr := addr.UDPAddr() uAddr := addr.UDPAddr()
if uAddr == nil {
return nil, 0, errors.New("parse addr error")
}
length := len(payload) length := len(payload)
if n-headLen < length { if n-headLen < length {

3
transport/trojan/trojan.go
View file

@ -170,6 +170,9 @@ func ReadPacket(r io.Reader, payload []byte) (net.Addr, int, int, error) {
return nil, 0, 0, errors.New("read addr error") return nil, 0, 0, errors.New("read addr error")
} }
uAddr := addr.UDPAddr() uAddr := addr.UDPAddr()
if uAddr == nil {
return nil, 0, 0, errors.New("parse addr error")
}
if _, err = io.ReadFull(r, payload[:2]); err != nil { if _, err = io.ReadFull(r, payload[:2]); err != nil {
return nil, 0, 0, errors.New("read length error") return nil, 0, 0, errors.New("read length error")