kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1314 from alindeman/bridge-conflict-panic

Browse source 
Avoids panic when checking for conflicts against an uninitalized network
This commit is contained in:
Alessandro Boch 2016-07-07 09:55:11 -07:00 committed by GitHub
commit 10aec4d8f0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/bridge/bridge.go
View file

@ -330,7 +330,7 @@ func (c *networkConfiguration) conflictsWithNetworks(id string, others []*bridge
// bridges. This could not be completely caught by the config conflict // bridges. This could not be completely caught by the config conflict
// check, because networks which config does not specify the AddressIPv4 // check, because networks which config does not specify the AddressIPv4
// get their address and subnet selected by the driver (see electBridgeIPv4()) // get their address and subnet selected by the driver (see electBridgeIPv4())
if c.AddressIPv4 != nil { if c.AddressIPv4 != nil && nwBridge.bridgeIPv4 != nil {
if nwBridge.bridgeIPv4.Contains(c.AddressIPv4.IP) || if nwBridge.bridgeIPv4.Contains(c.AddressIPv4.IP) ||
c.AddressIPv4.Contains(nwBridge.bridgeIPv4.IP) { c.AddressIPv4.Contains(nwBridge.bridgeIPv4.IP) {
return types.ForbiddenErrorf("conflicts with network %s (%s) by ip network", nwID, nwConfig.BridgeName) return types.ForbiddenErrorf("conflicts with network %s (%s) by ip network", nwID, nwConfig.BridgeName)