From: Nikita Popov Date: Mon, 23 Mar 2020 10:54:55 +0000 (+0100) Subject: Fix RSA memory leak in mysqlnd auth X-Git-Tag: php-7.4.7RC1~111 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db08ef0d3274b239a6b9e68d71d02bb6acb71d82;p=php Fix RSA memory leak in mysqlnd auth --- diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index fa156fa0e1..fa8c709516 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -728,6 +728,7 @@ mysqlnd_sha256_public_encrypt(MYSQLND_CONN_DATA * conn, mysqlnd_rsa_t server_pub */ if (server_public_key_len <= passwd_len + 41) { /* password message is to long */ + RSA_free(server_public_key); SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "password is too long"); DBG_ERR("password is too long"); DBG_RETURN(NULL); @@ -1018,6 +1019,7 @@ mysqlnd_caching_sha2_public_encrypt(MYSQLND_CONN_DATA * conn, mysqlnd_rsa_t serv */ if (server_public_key_len <= passwd_len + 41) { /* password message is to long */ + RSA_free(server_public_key); SET_CLIENT_ERROR(conn->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "password is too long"); DBG_ERR("password is too long"); DBG_RETURN(0); @@ -1025,6 +1027,7 @@ mysqlnd_caching_sha2_public_encrypt(MYSQLND_CONN_DATA * conn, mysqlnd_rsa_t serv *crypted = emalloc(server_public_key_len); RSA_public_encrypt(passwd_len + 1, (zend_uchar *) xor_str, *crypted, server_public_key, RSA_PKCS1_OAEP_PADDING); + RSA_free(server_public_key); DBG_RETURN(server_public_key_len); } /* }}} */