From 3ef4af2eae875abc0305ddfc553946d4f4c686b1 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Wed, 21 Feb 2018 07:53:26 -0800
Subject: [PATCH] Fix crash when failing to create an LB policy.

---
 src/core/ext/filters/client_channel/client_channel.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 174a15b447d..9a8f25b630d 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -446,7 +446,6 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) {
         chand->lb_policy->UpdateLocked(*chand->resolver_result);
       } else {
         // Instantiate new LB policy.
-        lb_policy_created = true;
         grpc_core::LoadBalancingPolicy::Args lb_policy_args;
         lb_policy_args.combiner = chand->combiner;
         lb_policy_args.client_channel_factory = chand->client_channel_factory;
@@ -458,6 +457,7 @@ static void on_resolver_result_changed_locked(void* arg, grpc_error* error) {
           gpr_log(GPR_ERROR, "could not create LB policy \"%s\"",
                   lb_policy_name);
         } else {
+          lb_policy_created = true;
           reresolution_request_args* args =
               static_cast<reresolution_request_args*>(
                   gpr_zalloc(sizeof(*args)));