pogmommy/gonetworkmanager
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17 from bingfengfeifei/master

Browse source 
Fix GetPropertyRouteData panic
This commit is contained in:
Christian Müller 2021-03-26 09:01:42 +01:00 • committed by GitHub
commit 44424b8ca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
IP4Config.go
View file

@ -191,7 +191,7 @@ func (c *ip4Config) GetPropertyRouteData() ([]IP4RouteData, error) {
return routes, err return routes, err
} }
for _, routeData := range routesData { for index, routeData := range routesData {
route := IP4RouteData{} route := IP4RouteData{}
@ -222,11 +222,14 @@ func (c *ip4Config) GetPropertyRouteData() ([]IP4RouteData, error) {
} }
route.Metric = uint8(metric) route.Metric = uint8(metric)
default: default:
if route.AdditionalAttributes == nil {
route.AdditionalAttributes = make(map[string]string)
}
route.AdditionalAttributes[routeDataAttributeName] = routeDataAttribute.String() route.AdditionalAttributes[routeDataAttributeName] = routeDataAttribute.String()
} }
} }
routes = append(routes, route) routes[index] = route
} }
return routes, nil return routes, nil
} }

9
IP6Config.go
View file

@ -129,7 +129,7 @@ func (c *ip6Config) GetPropertyRouteData() ([]IP6RouteData, error) {
return routes, err return routes, err
} }
for _, routeData := range routesData { for index, routeData := range routesData {
route := IP6RouteData{} route := IP6RouteData{}
@ -160,11 +160,14 @@ func (c *ip6Config) GetPropertyRouteData() ([]IP6RouteData, error) {
} }
route.Metric = uint8(metric) route.Metric = uint8(metric)
default: default:
if route.AdditionalAttributes == nil {
route.AdditionalAttributes = make(map[string]string)
}
route.AdditionalAttributes[routeDataAttributeName] = routeDataAttribute.String() route.AdditionalAttributes[routeDataAttributeName] = routeDataAttribute.String()
} }
} }
routes = append(routes, route) routes[index] = route
} }
return routes, nil return routes, nil
} }