From a91f0712d120a21e49061d61eb6ba9b88cb0d376 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 13 May 2020 11:52:04 -0700 Subject: [PATCH] icmp, webdav/internal/xml: avoid string(int) Updates golang/go#32479 Change-Id: Ife0c3a2f10afb676af5f2110a9681216122c8808 Reviewed-on: https://go-review.googlesource.com/c/net/+/233900 Run-TryBot: Brad Fitzpatrick Reviewed-by: Ian Lance Taylor TryBot-Result: Gobot Gobot --- icmp/interface.go | 2 +- webdav/internal/xml/xml.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/icmp/interface.go b/icmp/interface.go index ae14818d..b3dd72fb 100644 --- a/icmp/interface.go +++ b/icmp/interface.go @@ -300,7 +300,7 @@ func parseInterfaceIdent(b []byte) (Extension, error) { } switch ifi.Type { case typeInterfaceByName: - ifi.Name = strings.Trim(string(b[4:]), string(0)) + ifi.Name = strings.Trim(string(b[4:]), "\x00") case typeInterfaceByIndex: if len(b[4:]) < 4 { return nil, errInvalidExtension diff --git a/webdav/internal/xml/xml.go b/webdav/internal/xml/xml.go index 5b79cbec..7d88dac7 100644 --- a/webdav/internal/xml/xml.go +++ b/webdav/internal/xml/xml.go @@ -945,7 +945,7 @@ func (d *Decoder) ungetc(b byte) { d.offset-- } -var entity = map[string]int{ +var entity = map[string]rune{ "lt": '<', "gt": '>', "amp": '&', @@ -1040,7 +1040,7 @@ Input: d.buf.WriteByte(';') n, err := strconv.ParseUint(s, base, 64) if err == nil && n <= unicode.MaxRune { - text = string(n) + text = string(rune(n)) haveText = true } }