Merge branch 'PHP-8.1' into PHP-8.2

nielsdos · nielsdos · commit 337973fccc60 · 2023-03-24T18:06:53.000+01:00
* PHP-8.1: Fix GH-8979: Possible Memory Leak with SSL-enabled MySQL connections
diff --git a/NEWS b/NEWS
@@ -35,6 +35,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-10521 (ftp_get/ftp_nb_get resumepos offset is maximum 10GB).
     (nielsdos)
 
+- MySQLnd:
+  . Fixed bug GH-8979 (Possible Memory Leak with SSL-enabled MySQL
+    connections). (nielsdos)
+
 - Opcache:
   . Fixed build for macOS to cater with pkg-config settings. (David Carlier)
   . Fixed bug GH-8065 (opcache.consistency_checks > 0 causes segfaults in
diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c
@@ -561,6 +561,10 @@ MYSQLND_METHOD(mysqlnd_vio, enable_ssl)(MYSQLND_VIO * const net)
 		}
 	}
 	php_stream_context_set(net_stream, context);
+	/* php_stream_context_set() increases the refcount of context, but we just want to transfer ownership
+	 * hence the need to decrease the refcount so the refcount will be equal to 1. */
+	ZEND_ASSERT(GC_REFCOUNT(context->res) == 2);
+	GC_DELREF(context->res);
 	if (php_stream_xport_crypto_setup(net_stream, STREAM_CRYPTO_METHOD_TLS_CLIENT, NULL) < 0 ||
 	    php_stream_xport_crypto_enable(net_stream, 1) < 0)
 	{

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,10 @@ MYSQLND_METHOD(mysqlnd_vio, enable_ssl)(MYSQLND_VIO * const net)`
`561`	`561`	`}`
`562`	`562`	`}`
`563`	`563`	`php_stream_context_set(net_stream, context);`
	`564`	`+ /* php_stream_context_set() increases the refcount of context, but we just want to transfer ownership`
	`565`	`+ * hence the need to decrease the refcount so the refcount will be equal to 1. */`
	`566`	`+ ZEND_ASSERT(GC_REFCOUNT(context->res) == 2);`
	`567`	`+ GC_DELREF(context->res);`
`564`	`568`	`if (php_stream_xport_crypto_setup(net_stream, STREAM_CRYPTO_METHOD_TLS_CLIENT, NULL) < 0 \|\|`
`565`	`569`	`php_stream_xport_crypto_enable(net_stream, 1) < 0)`
`566`	`570`	`{`