Fix a memleak with mysqlnd and SSL

johannes · johannes · commit 74ed42c169be · 2018-02-20T23:28:23.000+01:00
diff --git a/NEWS b/NEWS
@@ -19,6 +19,10 @@ PHP                                                                        NEWS
 - libxml2:
   . Fixed bug #75871 (use pkg-config where available). (pmmaga)
 
+- mysqlnd
+  . Fixed negotiation of MySQL authenticaton plugin. (Johannes)
+  . Fixed a memleak with SSL connections. (Johannes)
+
 - ODBC:
   . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
 
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
@@ -787,7 +787,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self
 	DBG_INF_FMT("salt(%d)=[%.*s]", auth_plugin_data_len, auth_plugin_data_len, auth_plugin_data);
 
 
-	if (conn->protocol_frame_codec->data->ssl) {
+	if (conn->vio->data->ssl) {
 		DBG_INF("simple clear text under SSL");
 		/* clear text under SSL */
 		*auth_data_len = passwd_len;
diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c
@@ -517,6 +517,7 @@ MYSQLND_METHOD(mysqlnd_vio, enable_ssl)(MYSQLND_VIO * const net)
 		zval cafile_zval;
 		ZVAL_STRING(&cafile_zval, net->data->options.ssl_ca);
 		php_stream_context_set_option(context, "ssl", "cafile", &cafile_zval);
+		zval_ptr_dtor(&cafile_zval);
 		any_flag = TRUE;
 	}
 	if (net->data->options.ssl_capath) {

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,7 @@ MYSQLND_METHOD(mysqlnd_vio, enable_ssl)(MYSQLND_VIO * const net)`
`517`	`517`	`zval cafile_zval;`
`518`	`518`	`ZVAL_STRING(&cafile_zval, net->data->options.ssl_ca);`
`519`	`519`	`php_stream_context_set_option(context, "ssl", "cafile", &cafile_zval);`
	`520`	`+ zval_ptr_dtor(&cafile_zval);`
`520`	`521`	`any_flag = TRUE;`
`521`	`522`	`}`
`522`	`523`	`if (net->data->options.ssl_capath) {`