Simplify XORMappedAddress IP slice initialization

cppcoffee · cppcoffee · commit b96750d516be · 2025-06-01T10:10:22.000+08:00
Signed-off-by: Xiaobo Liu &lt;cppcoffee@gmail.com&gt;
diff --git a/xoraddr.go b/xoraddr.go
@@ -103,15 +103,14 @@ func (a *XORMappedAddress) GetFromAs(msg *Message, attr AttrType) error {
 	}
 	// Ensuring len(a.IP) == ipLen and reusing a.IP.
 	if len(a.IP) < ipLen {
-		a.IP = a.IP[:cap(a.IP)]
-		for len(a.IP) < ipLen {
-			a.IP = append(a.IP, 0)
+		a.IP = make(net.IP, ipLen)
+	} else {
+		a.IP = a.IP[:ipLen]
+		for i := range a.IP {
+			a.IP[i] = 0
 		}
 	}
-	a.IP = a.IP[:ipLen]
-	for i := range a.IP {
-		a.IP[i] = 0
-	}
+
 	if len(value) <= 4 {
 		return io.ErrUnexpectedEOF
 	}

Original file line number	Diff line number	Diff line change
`@@ -103,15 +103,14 @@ func (a XORMappedAddress) GetFromAs(msg Message, attr AttrType) error {`
`103`	`103`	`}`
`104`	`104`	`// Ensuring len(a.IP) == ipLen and reusing a.IP.`
`105`	`105`	`if len(a.IP) < ipLen {`
`106`		`- a.IP = a.IP[:cap(a.IP)]`
`107`		`- for len(a.IP) < ipLen {`
`108`		`- a.IP = append(a.IP, 0)`
	`106`	`+ a.IP = make(net.IP, ipLen)`
	`107`	`+ } else {`
	`108`	`+ a.IP = a.IP[:ipLen]`
	`109`	`+ for i := range a.IP {`
	`110`	`+ a.IP[i] = 0`
`109`	`111`	`}`
`110`	`112`	`}`
`111`		`- a.IP = a.IP[:ipLen]`
`112`		`- for i := range a.IP {`
`113`		`- a.IP[i] = 0`
`114`		`- }`
	`113`	`+`
`115`	`114`	`if len(value) <= 4 {`
`116`	`115`	`return io.ErrUnexpectedEOF`
`117`	`116`	`}`