diff options
| author |  Michael Lumish <mlumish@google.com> | 2015-02-25 10:18:48 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2015-02-25 10:18:48 -0800 |
| commit | 46f8495266e8ec3cf0639b10847e7c9b1d1485d3 (patch) | |
| tree | 730ab97a19434b5f1a99e2b64ed3b7ac2c8dbbc5 /src | |
| parent | da93f7988da5780c8470591e41191acf13d3a2c1 (diff) | |
| parent | 363eb8e27befc10dcff85aaadcbbf5d651c2394e (diff) | |
Merge pull request #788 from ctiller/sec-wtf
Fix read through null pointer
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/tsi/ssl_transport_security.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 9ca8e6ddc9..8446cc4fdc 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -1094,8 +1094,9 @@ static int does_entry_match_name(const char* entry, size_t entry_length, return 0; } name_subdomain = strchr(name, '.'); + if (name_subdomain == NULL) return 0; name_subdomain_length = strlen(name_subdomain); - if (name_subdomain == NULL || name_subdomain_length < 2) return 0; + if (name_subdomain_length < 2) return 0; name_subdomain++; /* Starts after the dot. */ name_subdomain_length--; entry += 2; /* Remove *. */ |