Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-02-23 07:03:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: provider filter potential panic

Browse Source
This commit is contained in:
Dreamacro 2021-11-21 17:44:03 +08:00
parent 1401a82bb0
commit b1bed7623d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adapter/provider/parser.go
View File

@ -60,5 +60,5 @@ func ParseProxyProvider(name string, mapping map[string]interface{}) (types.Prox
interval := time.Duration(uint(schema.Interval)) * time.Second
filter := schema.Filter
return NewProxySetProvider(name, interval, filter, vehicle, hc), nil
return NewProxySetProvider(name, interval, filter, vehicle, hc)
}

8
adapter/provider/provider.go
View File

@ -96,7 +96,11 @@ func stopProxyProvider(pd *ProxySetProvider) {
pd.fetcher.Destroy()
}
func NewProxySetProvider(name string, interval time.Duration, filter string, vehicle types.Vehicle, hc *HealthCheck) *ProxySetProvider {
func NewProxySetProvider(name string, interval time.Duration, filter string, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
if _, err := regexp.Compile(filter); err != nil {
return nil, fmt.Errorf("invalid filter regex: %w", err)
}
if hc.auto() {
go hc.process()
}
@ -150,7 +154,7 @@ func NewProxySetProvider(name string, interval time.Duration, filter string, veh
wrapper := &ProxySetProvider{pd}
runtime.SetFinalizer(wrapper, stopProxyProvider)
return wrapper
return wrapper, nil
}
// for auto gc