aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-05-10 13:35:11 -0700
committerGravatar GitHub <noreply@github.com>2017-05-10 13:35:11 -0700
commit5d5bbc9f8c223612717a3e3dc6fcb9b878a0e226 (patch)
tree55168a852ee5f048892c55dc60980700f56f94c2 /test/cpp
parent025384c5370b783a2b133382557645800f4289e8 (diff)
parenta189bacc9517919546b97e02aba5c01224f6790f (diff)
Merge pull request #11061 from ctiller/ubsanc++
Fixes for ubsan C++ build
Diffstat (limited to 'test/cpp')
-rw-r--r--test/cpp/microbenchmarks/bm_call_create.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc
index c91219e98c..67e7c02535 100644
--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@@ -563,7 +563,8 @@ static void BM_IsolatedFilter(benchmark::State &state) {
}
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
- size_t channel_size = grpc_channel_stack_size(&filters[0], filters.size());
+ size_t channel_size = grpc_channel_stack_size(
+ filters.size() == 0 ? NULL : &filters[0], filters.size());
grpc_channel_stack *channel_stack =
static_cast<grpc_channel_stack *>(gpr_zalloc(channel_size));
GPR_ASSERT(GRPC_LOG_IF_ERROR(