Merge branch 'PHP-7.4'

nikic · nikic · commit e2a1dbd5020e · 2019-12-11T10:32:06.000+01:00
* PHP-7.4:
  Free RSA public key in mysqlnd sha256 auth
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
@@ -808,6 +808,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
 			*auth_data_len = server_public_key_len;
 			ret = malloc(*auth_data_len);
 			RSA_public_encrypt(passwd_len + 1, (zend_uchar *) xor_str, ret, server_public_key, RSA_PKCS1_OAEP_PADDING);
+			RSA_free(server_public_key);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self`
`808`	`808`	`*auth_data_len = server_public_key_len;`
`809`	`809`	`ret = malloc(*auth_data_len);`
`810`	`810`	`RSA_public_encrypt(passwd_len + 1, (zend_uchar *) xor_str, ret, server_public_key, RSA_PKCS1_OAEP_PADDING);`
	`811`	`+ RSA_free(server_public_key);`
`811`	`812`	`}`
`812`	`813`	`}`
`813`	`814`