github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

check init state of DomainMatcherGroup. fixes #1238

pull/1269/head
Darien Raymond 2018-08-20 09:47:18 +02:00
parent fca324a399
commit 899b1399ee
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/strmatcher/domain_matcher.go
View File

@ -39,6 +39,10 @@ func (g *DomainMatcherGroup) Add(domain string, value uint32) {
func (g *DomainMatcherGroup) Match(domain string) uint32 { func (g *DomainMatcherGroup) Match(domain string) uint32 {
current := g.root current := g.root
if current == nil {
return 0
}
parts := breakDomain(domain) parts := breakDomain(domain)
for i := len(parts) - 1; i >= 0; i-- { for i := len(parts) - 1; i >= 0; i-- {
part := parts[i] part := parts[i]

8
common/strmatcher/domain_matcher_test.go
View File

@ -33,3 +33,11 @@ func TestDomainMatcherGroup(t *testing.T) {
} }
} }
} }
func TestEmptyDomainMatcherGroup(t *testing.T) {
g := new(DomainMatcherGroup)
r := g.Match("v2ray.com")
if r != 0 {
t.Error("Expect 0, but ", r)
}
}