Merge pull request #19639 from AspirinSJL/fix_pf_segv

Fix segv in pick_first
6 years ago · 34f247e497
parent f75400dc73 fa4e0f040f
commit 34f247e497
1 changed files with 1 additions and 1 deletions
--- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
@ -176,7 +176,7 @@ void PickFirst::ExitIdleLocked() {
 }

 void PickFirst::ResetBackoffLocked() {
-  subchannel_list_->ResetBackoffLocked();
+  if (subchannel_list_ != nullptr) subchannel_list_->ResetBackoffLocked();
  if (latest_pending_subchannel_list_ != nullptr) {
    latest_pending_subchannel_list_->ResetBackoffLocked();
  }