From 09030ee73693411c19b596cb0e0f43eb512ac0e6 Mon Sep 17 00:00:00 2001 From: Jiasheng Jiang Date: Sat, 5 Feb 2022 19:31:11 +0800 Subject: Add the check after calling OPENSSL_strdup Since the potential failure of the memory allocation, the OPENSSL_strdup() could return NULL pointer. Therefore, it should be better to check it in order to guarantee the success of the configuration, same as the check for SSL_CTX_set_srp_username(). Signed-off-by: Jiasheng Jiang Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17643) --- test/helpers/handshake_srp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'test') diff --git a/test/helpers/handshake_srp.c b/test/helpers/handshake_srp.c index f18e5c81a6..11825d1dca 100644 --- a/test/helpers/handshake_srp.c +++ b/test/helpers/handshake_srp.c @@ -49,6 +49,13 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, SSL_CTX_set_srp_username_callback(server_ctx, server_srp_cb); server_ctx_data->srp_user = OPENSSL_strdup(extra->server.srp_user); server_ctx_data->srp_password = OPENSSL_strdup(extra->server.srp_password); + if (server_ctx_data->srp_user == NULL || server_ctx_data->srp_password == NULL) { + OPENSSL_free(server_ctx_data->srp_user); + OPENSSL_free(server_ctx_data->srp_password); + server_ctx_data->srp_user = NULL; + server_ctx_data->srp_password = NULL; + return 0; + } SSL_CTX_set_srp_cb_arg(server_ctx, server_ctx_data); } if (extra->server2.srp_user != NULL) { @@ -57,6 +64,13 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, SSL_CTX_set_srp_username_callback(server2_ctx, server_srp_cb); server2_ctx_data->srp_user = OPENSSL_strdup(extra->server2.srp_user); server2_ctx_data->srp_password = OPENSSL_strdup(extra->server2.srp_password); + if (server2_ctx_data->srp_user == NULL || server2_ctx_data->srp_password == NULL) { + OPENSSL_free(server2_ctx_data->srp_user); + OPENSSL_free(server2_ctx_data->srp_password); + server2_ctx_data->srp_user = NULL; + server2_ctx_data->srp_password = NULL; + return 0; + } SSL_CTX_set_srp_cb_arg(server2_ctx, server2_ctx_data); } if (extra->client.srp_user != NULL) { @@ -65,6 +79,8 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, return 0; SSL_CTX_set_srp_client_pwd_callback(client_ctx, client_srp_cb); client_ctx_data->srp_password = OPENSSL_strdup(extra->client.srp_password); + if (client_ctx_data->srp_password == NULL) + return 0; SSL_CTX_set_srp_cb_arg(client_ctx, client_ctx_data); } return 1; -- cgit v1.2.3