From 0344f49f28b9891caea512fc07f6cbad05399311 Mon Sep 17 00:00:00 2001 From: Tnze Date: Sun, 4 Apr 2021 10:37:22 +0800 Subject: [PATCH] security update --- bot/mcbot.go | 3 +-- bot/pinglist.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bot/mcbot.go b/bot/mcbot.go index cf8e09c..1e3551f 100644 --- a/bot/mcbot.go +++ b/bot/mcbot.go @@ -33,7 +33,6 @@ func (c *Client) JoinServerWithDialer(d *net.Dialer, addr string) (err error) { // parseAddress will lookup SRV records for the address func parseAddress(r *net.Resolver, addr string) (string, error) { - const missingPort = "missing port in address" var port uint16 var addrErr *net.AddrError host, portStr, err := net.SplitHostPort(addr) @@ -71,7 +70,7 @@ func (c *Client) join(d *net.Dialer, addr string) error { if err != nil { return LoginErr{"split address", err} } - port, err := strconv.Atoi(portStr) + port, err := strconv.ParseUint(portStr, 0, 16) if err != nil { return LoginErr{"parse port", err} } diff --git a/bot/pinglist.go b/bot/pinglist.go index c8fff63..bc09da7 100644 --- a/bot/pinglist.go +++ b/bot/pinglist.go @@ -56,7 +56,7 @@ func pingAndList(addr string, conn *mcnet.Conn) ([]byte, time.Duration, error) { if err != nil { return nil, 0, LoginErr{"split address", err} } - port, err := strconv.Atoi(portStr) + port, err := strconv.ParseUint(portStr, 0, 16) if err != nil { return nil, 0, LoginErr{"parse port", err} }