From 2f9c72b081ab2e16cef4690687c6e56c8b91f1c2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 20 Jul 2018 15:09:03 +0200 Subject: [PATCH] Prevent NPE in addServiceInfoToCluster() `ep.Iface()` can return `nil`, in which case `Address()` would result in a NPE. Signed-off-by: Sebastiaan van Stijn --- agent.go | 2 +- endpoint_info.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent.go b/agent.go index a9d77e2670..ca26a22bea 100644 --- a/agent.go +++ b/agent.go @@ -583,7 +583,7 @@ func (ep *endpoint) deleteDriverInfoFromCluster() error { } func (ep *endpoint) addServiceInfoToCluster(sb *sandbox) error { - if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface().Address() == nil { + if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface() == nil || ep.Iface().Address() == nil { return nil } diff --git a/endpoint_info.go b/endpoint_info.go index 80b662defa..3b9263f216 100644 --- a/endpoint_info.go +++ b/endpoint_info.go @@ -216,7 +216,7 @@ func (ep *endpoint) Iface() InterfaceInfo { return ep.iface } - return nil + return &endpointInterface{} } func (ep *endpoint) Interface() driverapi.InterfaceInfo {