lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

Merge pull request #148 from Vigilans/vigilans/dns-fix-array-panic

Browse Source 
Fix: Bound check when accessing DNS server's ipIndexMap
This commit is contained in:
Kslr 2020-08-31 12:32:55 +08:00 committed by GitHub
commit e55fdda5b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/dns/server.go
View File

@ -256,7 +256,10 @@ func (s *Server) IsOwnLink(ctx context.Context) bool {
// Match check dns ip match geoip // Match check dns ip match geoip
func (s *Server) Match(idx int, client Client, domain string, ips []net.IP) ([]net.IP, error) { func (s *Server) Match(idx int, client Client, domain string, ips []net.IP) ([]net.IP, error) {
matcher := s.ipIndexMap[idx] var matcher *MultiGeoIPMatcher
if idx < len(s.ipIndexMap) {
matcher = s.ipIndexMap[idx]
}
if matcher == nil { if matcher == nil {
return ips, nil return ips, nil
} }

2
common/strmatcher/strmatcher.go
View File

@ -49,7 +49,7 @@ func (t Type) New(pattern string) (Matcher, error) {
// IndexMatcher is the interface for matching with a group of matchers. // IndexMatcher is the interface for matching with a group of matchers.
type IndexMatcher interface { type IndexMatcher interface {
// Match returns the the index of a matcher that matches the input. It returns 0 if no such matcher exists. // Match returns the the index of a matcher that matches the input. It returns empty array if no such matcher exists.
Match(input string) []uint32 Match(input string) []uint32
} }