xinb
/
ip2region_private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #487 from lionsoul2014/fix_golang_cidr_to_range 

fix Index overflow for the cidr parse with bits equals to IP max bits
This commit is contained in:
Leon / 狮子的魂 2026-05-19 19:49:56 +08:00 committed by GitHub
parent c5fb71facb 8b79b69524
commit 82a73fa60d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maker/golang/xdb/util.go
View File

@ -65,7 +65,14 @@ func CIDR2Range(cidrStr string) ([]byte, []byte, error) {
// border byte rest bit filled with 1 // border byte rest bit filled with 1
byteIdx := bits / 8 byteIdx := bits / 8
// check and fill the border byte bits.
// @Note this check is possible since there will be bits
// like 32 in IPv4 and 128 in IPv6.
// fmt.Printf("%s -> bits=%d, byteIdx=%d, maskIdx=%d\n", cidrStr, bits, byteIdx, bits-byteIdx*8)
if byteIdx < ipl {
eip[byteIdx] |= bitMaskList[bits-(byteIdx*8)] eip[byteIdx] |= bitMaskList[bits-(byteIdx*8)]
}
// fill all the rest bits with 1 // fill all the rest bits with 1
for bi := byteIdx + 1; bi < ipl; bi++ { for bi := byteIdx + 1; bi < ipl; bi++ {

16
maker/golang/xdb/util_test.go
View File

@ -364,3 +364,19 @@ func TestCIDR2Range(t *testing.T) {
fmt.Printf("cidr=%s: {sip=%s, eip=%s}\n", item[0], item[1], item[2]) fmt.Printf("cidr=%s: {sip=%s, eip=%s}\n", item[0], item[1], item[2])
} }
} }
func TestCIDR2Range_Fix(t *testing.T) {
var strList = []string{
// "14.200.21.0/24",
"14.200.21.158/32",
}
for _, cidr := range strList {
sip, eip, err := CIDR2Range(cidr)
if err != nil {
t.Fatalf("CIDR2Range: %s", err)
}
fmt.Printf("cidr=%s: {sip=%s, eip=%s}\n", cidr, IP2String(sip), IP2String(eip))
}
}