mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-14 20:39:36 +03:00
Code Issues Releases Activity

Core: Fix memory leaks with RequireFeatures() (#4095)

Browse Source 
Fixes https://github.com/XTLS/Xray-core/issues/4054
Fixes https://github.com/XTLS/Xray-core/issues/3338
Fixes https://github.com/XTLS/Xray-core/issues/3221
This commit is contained in:
yuhan6665
2024-12-10 20:07:52 -05:00
committed by GitHub
parent a2b773135a
commit 0e2304c403
15 changed files with 98 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/router/balancing.go
View File

@ -5,7 +5,6 @@ import (
sync "sync"
"github.com/xtls/xray-core/app/observatory"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/errors"
"github.com/xtls/xray-core/core"
"github.com/xtls/xray-core/features/extension"
@ -31,6 +30,11 @@ type RoundRobinStrategy struct {
func (s *RoundRobinStrategy) InjectContext(ctx context.Context) {
s.ctx = ctx
if len(s.FallbackTag) > 0 {
core.RequireFeaturesAsync(s.ctx, func(observatory extension.Observatory) {
s.observatory = observatory
})
}
}
func (s *RoundRobinStrategy) GetPrincipleTarget(strings []string) []string {
@ -38,12 +42,6 @@ func (s *RoundRobinStrategy) GetPrincipleTarget(strings []string) []string {
}
func (s *RoundRobinStrategy) PickOutbound(tags []string) string {
if len(s.FallbackTag) > 0 && s.observatory == nil {
common.Must(core.RequireFeatures(s.ctx, func(observatory extension.Observatory) error {
s.observatory = observatory
return nil
}))
}
if s.observatory != nil {
observeReport, err := s.observatory.GetObservation(s.ctx)
if err == nil {