From e8b4e624a074730244967843983d84c371dc0847 Mon Sep 17 00:00:00 2001 From: John Plevyak Date: Wed, 11 Sep 2019 13:35:34 -0700 Subject: [PATCH] Fix potential null pointer dereference. Signed-off-by: John Plevyak --- source/common/upstream/cluster_manager_impl.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc index 7252be1202a1..a6e613f460d8 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -463,7 +463,9 @@ bool ClusterManagerImpl::addOrUpdateCluster(const envoy::api::v2::Cluster& clust existing_warming_cluster != warming_clusters_.end()) { // The following init manager remove call is a NOP in the case we are already initialized. It's // just kept here to avoid additional logic. - init_helper_.removeCluster(*existing_active_cluster->second->cluster_); + if (existing_active_cluster != active_clusters_.end()) { + init_helper_.removeCluster(*existing_active_cluster->second->cluster_); + } cm_stats_.cluster_modified_.inc(); } else { cm_stats_.cluster_added_.inc();