mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-10-06 18:06:36 +08:00
fix: prevent nil pointer dereference in listener config parsing
This commit is contained in:
@@ -211,7 +211,6 @@ func ParseService(cfg *config.ServiceConfig) (service.Service, error) {
|
|||||||
listener.AuthOption(auth_parser.Info(cfg.Listener.Auth)),
|
listener.AuthOption(auth_parser.Info(cfg.Listener.Auth)),
|
||||||
listener.TLSConfigOption(tlsConfig),
|
listener.TLSConfigOption(tlsConfig),
|
||||||
listener.AdmissionOption(xadmission.AdmissionGroup(admissions...)),
|
listener.AdmissionOption(xadmission.AdmissionGroup(admissions...)),
|
||||||
trafficLimiter,
|
|
||||||
listener.ConnLimiterOption(registry.ConnLimiterRegistry().Get(cfg.CLimiter)),
|
listener.ConnLimiterOption(registry.ConnLimiterRegistry().Get(cfg.CLimiter)),
|
||||||
listener.ServiceOption(cfg.Name),
|
listener.ServiceOption(cfg.Name),
|
||||||
listener.ProxyProtocolOption(ppv),
|
listener.ProxyProtocolOption(ppv),
|
||||||
@@ -219,6 +218,9 @@ func ParseService(cfg *config.ServiceConfig) (service.Service, error) {
|
|||||||
listener.NetnsOption(netnsIn),
|
listener.NetnsOption(netnsIn),
|
||||||
listener.LoggerOption(listenerLogger),
|
listener.LoggerOption(listenerLogger),
|
||||||
}
|
}
|
||||||
|
if trafficLimiter != nil {
|
||||||
|
listenOpts = append(listenOpts, trafficLimiter)
|
||||||
|
}
|
||||||
|
|
||||||
if netnsIn != "" {
|
if netnsIn != "" {
|
||||||
runtime.LockOSThread()
|
runtime.LockOSThread()
|
||||||
|
|||||||
Reference in New Issue
Block a user