Skip to content
Snippets Groups Projects
Commit f1a20188 authored by Nicolas Noble's avatar Nicolas Noble
Browse files

Merge pull request #3247 from yang-g/fix_build_beta

Guard against empty vector
parents 0269c9c2 61e461e8
No related branches found
No related tags found
No related merge requests found
...@@ -101,7 +101,9 @@ void AuthMetadataProcessorAyncWrapper::InvokeProcessor( ...@@ -101,7 +101,9 @@ void AuthMetadataProcessorAyncWrapper::InvokeProcessor(
0, 0,
{{nullptr, nullptr, nullptr, nullptr}}}); {{nullptr, nullptr, nullptr, nullptr}}});
} }
cb(user_data, &consumed_md[0], consumed_md.size(), &response_md[0], auto consumed_md_data = consumed_md.empty() ? nullptr : &consumed_md[0];
auto response_md_data = response_md.empty() ? nullptr : &response_md[0];
cb(user_data, consumed_md_data, consumed_md.size(), response_md_data,
response_md.size(), static_cast<grpc_status_code>(status.error_code()), response_md.size(), static_cast<grpc_status_code>(status.error_code()),
status.error_message().c_str()); status.error_message().c_str());
} }
...@@ -130,8 +132,8 @@ std::shared_ptr<ServerCredentials> SslServerCredentials( ...@@ -130,8 +132,8 @@ std::shared_ptr<ServerCredentials> SslServerCredentials(
} }
grpc_server_credentials* c_creds = grpc_ssl_server_credentials_create( grpc_server_credentials* c_creds = grpc_ssl_server_credentials_create(
options.pem_root_certs.empty() ? nullptr : options.pem_root_certs.c_str(), options.pem_root_certs.empty() ? nullptr : options.pem_root_certs.c_str(),
&pem_key_cert_pairs[0], pem_key_cert_pairs.size(), pem_key_cert_pairs.empty() ? nullptr : &pem_key_cert_pairs[0],
options.force_client_auth, nullptr); pem_key_cert_pairs.size(), options.force_client_auth, nullptr);
return std::shared_ptr<ServerCredentials>( return std::shared_ptr<ServerCredentials>(
new SecureServerCredentials(c_creds)); new SecureServerCredentials(c_creds));
} }
......
...@@ -128,7 +128,8 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() { ...@@ -128,7 +128,8 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
*port->selected_port = r; *port->selected_port = r;
} }
} }
if (!server->Start(&cqs_[0], cqs_.size())) { auto cqs_data = cqs_.empty() ? nullptr : &cqs_[0];
if (!server->Start(cqs_data, cqs_.size())) {
return nullptr; return nullptr;
} }
return server; return server;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment