fix IP2Long nil pointer panic bug

hyperjiang · hyperjiang · commit cb7fd0b4c6f3 · 2020-05-18T19:32:57.000+08:00
diff --git a/network.go b/network.go
@@ -55,7 +55,12 @@ func IP2Long(ipAddress string) uint32 {
 	if ip == nil {
 		return 0
 	}
-	return binary.BigEndian.Uint32(ip.To4())
+	ipByte := ip.To4()
+	if ipByte == nil {
+		return 0
+	}
+
+	return binary.BigEndian.Uint32(ipByte)
 }
 
 // Long2IP converts an long integer address into a string in (IPv4) Internet standard dotted format
diff --git a/network_test.go b/network_test.go
@@ -39,6 +39,7 @@ var _ = Describe("Network Functions", func() {
 	It("IP2Long", func() {
 		Expect(php.IP2Long("127.0.0.1")).To(Equal(uint32(2130706433)))
 		Expect(php.IP2Long("333.33.3.3")).To(BeZero())
+		Expect(php.IP2Long("::1")).To(BeZero())
 	})
 
 	It("Long2IP", func() {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,12 @@ func IP2Long(ipAddress string) uint32 {`
`55`	`55`	`if ip == nil {`
`56`	`56`	`return 0`
`57`	`57`	`}`
`58`		`- return binary.BigEndian.Uint32(ip.To4())`
	`58`	`+ ipByte := ip.To4()`
	`59`	`+ if ipByte == nil {`
	`60`	`+ return 0`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ return binary.BigEndian.Uint32(ipByte)`
`59`	`64`	`}`
`60`	`65`
`61`	`66`	`// Long2IP converts an long integer address into a string in (IPv4) Internet standard dotted format`