nil pointer fixes (istio#4736)

Signed-off-by: Shriram Rajagopalan <shriramr@vmware.com>
mbhavya · Apr 4, 2018 · 57cff09 · 57cff09
1 parent e51254e
commit 57cff09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pilot/pkg/networking/core/v1alpha3/listener.go b/pilot/pkg/networking/core/v1alpha3/listener.go
@@ -193,8 +193,8 @@ func (configgen *ConfigGeneratorImpl) buildSidecarListeners(env model.Environmen
 // configuration for co-located service proxyInstances.
 func (configgen *ConfigGeneratorImpl) buildSidecarInboundListeners(env model.Environment, node model.Proxy,
 	proxyInstances []*model.ServiceInstance) []*xdsapi.Listener {
-	listeners := make([]*xdsapi.Listener, 0, len(proxyInstances))
 
+	var listeners []*xdsapi.Listener
 	mesh := env.Mesh
 	config := env.IstioConfigStore
 	// inbound connections/requests are redirected to the endpoint address but appear to be sent

diff --git a/pilot/pkg/networking/util/util.go b/pilot/pkg/networking/util/util.go
@@ -102,7 +102,7 @@ func BuildAddress(ip string, port uint32) core.Address {
 // TODO(mostrowski): consider passing map around to save iteration.
 func GetByAddress(listeners []*xdsapi.Listener, addr string) *xdsapi.Listener {
 	for _, listener := range listeners {
-		if listener.Address.String() == addr {
+		if listener != nil && listener.Address.String() == addr {
 			return listener
 		}
 	}