diff options
| author |  vjpai <vpai@google.com> | 2015-03-24 22:55:05 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-03-24 22:55:05 -0700 |
| commit | e98b1cc3565b28ea8df0946a2cd25d63a77e0fdc (patch) | |
| tree | f12ff189928106f7b9f1baf123d7a9024475e360 | |
| parent | df9f764bf873e1484b6ca60e4ca0207d3117cd06 (diff) | |
| parent | c637cc922fa5813bf9da5840b3746924dcc021cc (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | src/core/tsi/ssl_transport_security.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 33645ca8b8..018ddc4456 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -567,7 +567,8 @@ static tsi_result populate_ssl_context( EC_KEY* ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); if (!SSL_CTX_set_tmp_ecdh(context, ecdh)) { gpr_log(GPR_ERROR, "Could not set ephemeral ECDH key."); - result = TSI_INTERNAL_ERROR; + EC_KEY_free(ecdh); + return TSI_INTERNAL_ERROR; } SSL_CTX_set_options(context, SSL_OP_SINGLE_ECDH_USE); EC_KEY_free(ecdh); @@ -604,6 +605,7 @@ static tsi_result build_alpn_protocol_name_list( unsigned char* current; *protocol_name_list = NULL; *protocol_name_list_length = 0; + if (num_alpn_protocols == 0) return TSI_INVALID_ARGUMENT; for (i = 0; i < num_alpn_protocols; i++) { if (alpn_protocols_lengths[i] == 0) { gpr_log(GPR_ERROR, "Invalid 0-length protocol name."); |