fix IP2Long nil pointer panic bug

hyperjiang · May 18, 2020 · cb7fd0b · cb7fd0b
1 parent 9c2e114
commit cb7fd0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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() {