InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnetwork/cnmallocator: fix append to non-zero initialized length (makezero)

Browse Source 
libnetwork/cnmallocator/networkallocator.go:876:17: append to slice `ipamConfigs` with non-zero initialized length (makezero)
            ipamConfigs = append(ipamConfigs, &api.IPAMConfig{Family: api.IPAMConfig_IPV4})
                          ^

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-02-07 19:05:20 +01:00
parent 8e9fce7970
commit dd8ee9eeb1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnetwork/cnmallocator/networkallocator.go
View File

@@ -865,7 +865,7 @@ func (na *cnmNetworkAllocator) allocatePools(n *api.Network) (map[string]string,
// configs over Spec configs.
if n.IPAM != nil {
ipamConfigs = n.IPAM.Configs
} else if n.Spec.IPAM != nil {
} else if n.Spec.IPAM != nil && len(n.Spec.IPAM.Configs) > 0 {
ipamConfigs = make([]*api.IPAMConfig, len(n.Spec.IPAM.Configs))
copy(ipamConfigs, n.Spec.IPAM.Configs)
}
@@ -873,7 +873,7 @@ func (na *cnmNetworkAllocator) allocatePools(n *api.Network) (map[string]string,
// Append an empty slot for subnet allocation if there are no
// IPAM configs from either spec or state.
if len(ipamConfigs) == 0 {
ipamConfigs = append(ipamConfigs, &api.IPAMConfig{Family: api.IPAMConfig_IPV4})
ipamConfigs = []*api.IPAMConfig{{Family: api.IPAMConfig_IPV4}}
}
// Update the runtime IPAM configurations with initial state