diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2018-07-21 00:23:18 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-21 00:23:18 -0700 |
| commit | 2cfc216cfd58dc247249da87dbefa8bb949c8b9c (patch) | |
| tree | e578f211c40e68490ed77bace3b8b2b91acba826 /src/core/lib | |
| parent | dbc1e27e2e1a81b61eb064eb036ec6a267f88cb6 (diff) | |
| parent | d4c98676e359e74007b4f79e264b2f8fcfc30a58 (diff) | |
Merge pull request #15929 from Torgen/empty_product_name_segfault
Don't segfault when product name from BIOS is empty
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc index 7c4d7a71cd..8454fd7558 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc @@ -41,8 +41,9 @@ namespace internal { bool check_bios_data(const char* bios_data_file) { char* bios_data = read_bios_file(bios_data_file); - bool result = (!strcmp(bios_data, GRPC_ALTS_EXPECT_NAME_GOOGLE)) || - (!strcmp(bios_data, GRPC_ALTS_EXPECT_NAME_GCE)); + bool result = + bios_data && ((!strcmp(bios_data, GRPC_ALTS_EXPECT_NAME_GOOGLE)) || + (!strcmp(bios_data, GRPC_ALTS_EXPECT_NAME_GCE))); gpr_free(bios_data); return result; } |