diff options
| author |  Mark D. Roth <roth@google.com> | 2018-08-01 12:06:18 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-01 12:06:18 -0700 |
| commit | 3b60506f1aaf137077129bbbe882bc106449550e (patch) | |
| tree | 9e5342554616b99d0930f6c317b9a67300e1c2c5 | |
| parent | 92fd2620ab03c438fdeab23400cb6f31f5ba7816 (diff) | |
| parent | 95f81046dc6d43ecdf63820c7e56b42ad0734830 (diff) | |
Merge pull request #16207 from markdroth/ping_api_fix
Fix undefined behavior introduced in #16167.
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index 45bca2738c..fead8feb17 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -578,7 +578,12 @@ static void start_transport_op_locked(void* arg, grpc_error* error_ignored) { } else { grpc_error* error = GRPC_ERROR_NONE; grpc_core::LoadBalancingPolicy::PickState pick_state; - memset(&pick_state, 0, sizeof(pick_state)); + pick_state.initial_metadata = nullptr; + pick_state.initial_metadata_flags = 0; + pick_state.on_complete = nullptr; + memset(&pick_state.subchannel_call_context, 0, + sizeof(pick_state.subchannel_call_context)); + pick_state.user_data = nullptr; // Pick must return synchronously, because pick_state.on_complete is null. GPR_ASSERT(chand->lb_policy->PickLocked(&pick_state, &error)); if (pick_state.connected_subchannel != nullptr) { |