Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit ba9dfa733fb3 · 2026-05-22T19:44:11.000+02:00
* PHP-8.4:
  zlib: fix memory leak if deflate initialization fails and there is a dict
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.8
 
+- Zlib:
+  . Fixed memory leak if deflate initialization fails and there is a dict.
+    (ndossche)
 
 02 Jun 2026, PHP 8.5.7
 
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -911,6 +911,7 @@ PHP_FUNCTION(inflate_init)
 	}
 
 	if (inflateInit2(&ctx->Z, encoding) != Z_OK) {
+		efree(dict);
 		zval_ptr_dtor(return_value);
 		php_error_docref(NULL, E_WARNING, "Failed allocating zlib.inflate context");
 		RETURN_FALSE;
@@ -1161,6 +1162,7 @@ PHP_FUNCTION(deflate_init)
 	}
 
 	if (deflateInit2(&ctx->Z, level, Z_DEFLATED, encoding, memory, strategy) != Z_OK) {
+		efree(dict);
 		zval_ptr_dtor(return_value);
 		php_error_docref(NULL, E_WARNING, "Failed allocating zlib.deflate context");
 		RETURN_FALSE;

Original file line number	Diff line number	Diff line change
`@@ -911,6 +911,7 @@ PHP_FUNCTION(inflate_init)`
`911`	`911`	`}`
`912`	`912`
`913`	`913`	`if (inflateInit2(&ctx->Z, encoding) != Z_OK) {`
	`914`	`+ efree(dict);`
`914`	`915`	`zval_ptr_dtor(return_value);`
`915`	`916`	`php_error_docref(NULL, E_WARNING, "Failed allocating zlib.inflate context");`
`916`	`917`	`RETURN_FALSE;`
`@@ -1161,6 +1162,7 @@ PHP_FUNCTION(deflate_init)`
`1161`	`1162`	`}`
`1162`	`1163`
`1163`	`1164`	`if (deflateInit2(&ctx->Z, level, Z_DEFLATED, encoding, memory, strategy) != Z_OK) {`
	`1165`	`+ efree(dict);`
`1164`	`1166`	`zval_ptr_dtor(return_value);`
`1165`	`1167`	`php_error_docref(NULL, E_WARNING, "Failed allocating zlib.deflate context");`
`1166`	`1168`	`RETURN_FALSE;`