aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp
diff options
context:
space:
mode:
authorGravatar Raul Silvera <rsilvera@google.com>2015-03-02 18:42:19 -0800
committerGravatar Raul Silvera <rsilvera@google.com>2015-03-02 18:42:19 -0800
commit02fe58d1bdbc995a58b3b8a4fc65a78405cc2693 (patch)
tree0609af97b05cc149dae49ebb1f53a9f168e487d1 /src/cpp
parent79c7f85ba720f1cfaa004b72c9f11b784bdaffab (diff)
Propagate grpc_google_default_credentials_create errors
Diffstat (limited to 'src/cpp')
-rw-r--r--src/cpp/client/credentials.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cpp/client/credentials.cc b/src/cpp/client/credentials.cc
index a140f551e0..eff0892810 100644
--- a/src/cpp/client/credentials.cc
+++ b/src/cpp/client/credentials.cc
@@ -47,7 +47,8 @@ grpc_credentials *Credentials::GetRawCreds() { return creds_; }
std::unique_ptr<Credentials> CredentialsFactory::GoogleDefaultCredentials() {
grpc_credentials *c_creds = grpc_google_default_credentials_create();
- std::unique_ptr<Credentials> cpp_creds(new Credentials(c_creds));
+ std::unique_ptr<Credentials> cpp_creds(
+ c_creds == nullptr ? nullptr : new Credentials(c_creds));
return cpp_creds;
}