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

Merge pull request #51828 from vvoland/windows-network-none

Browse Source 
daemon/libnetwork: Fix panic in findHNSEp when IP networks are nil
This commit is contained in:
Sebastiaan van Stijn
2026-01-08 17:34:36 +01:00
committed by GitHub
parent 7bdc7569f1 fadd8dc47c
commit 48f81c3782
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/libnetwork/network_windows.go
View File

@@ -251,9 +251,14 @@ func deleteEpFromResolverImpl(
} }
func findHNSEp(ip4, ip6 *net.IPNet, hnsEndpoints []hcsshim.HNSEndpoint) *hcsshim.HNSEndpoint { func findHNSEp(ip4, ip6 *net.IPNet, hnsEndpoints []hcsshim.HNSEndpoint) *hcsshim.HNSEndpoint {
if ip4 == nil && ip6 == nil {
return nil
}
for _, hnsEp := range hnsEndpoints { for _, hnsEp := range hnsEndpoints {
if (hnsEp.IPAddress != nil && hnsEp.IPAddress.Equal(ip4.IP)) || if ip4 != nil && hnsEp.IPAddress != nil && hnsEp.IPAddress.Equal(ip4.IP) {
(hnsEp.IPv6Address != nil && hnsEp.IPv6Address.Equal(ip6.IP)) { return &hnsEp
}
if ip6 != nil && hnsEp.IPv6Address != nil && hnsEp.IPv6Address.Equal(ip6.IP) {
return &hnsEp return &hnsEp
} }
} }