Merge branch 'PHP-8.5'

ndossche · ndossche · commit a544b8b1ddb5 · 2026-05-22T19:44:17.000+02:00
* PHP-8.5:
  zlib: fix memory leak if deflate initialization fails and there is a dict
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -929,6 +929,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;
@@ -1174,6 +1175,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
`@@ -929,6 +929,7 @@ PHP_FUNCTION(inflate_init)`
`929`	`929`	`}`
`930`	`930`
`931`	`931`	`if (inflateInit2(&ctx->Z, encoding) != Z_OK) {`
	`932`	`+ efree(dict);`
`932`	`933`	`zval_ptr_dtor(return_value);`
`933`	`934`	`php_error_docref(NULL, E_WARNING, "Failed allocating zlib.inflate context");`
`934`	`935`	`RETURN_FALSE;`
`@@ -1174,6 +1175,7 @@ PHP_FUNCTION(deflate_init)`
`1174`	`1175`	`}`
`1175`	`1176`
`1176`	`1177`	`if (deflateInit2(&ctx->Z, level, Z_DEFLATED, encoding, memory, strategy) != Z_OK) {`
	`1178`	`+ efree(dict);`
`1177`	`1179`	`zval_ptr_dtor(return_value);`
`1178`	`1180`	`php_error_docref(NULL, E_WARNING, "Failed allocating zlib.deflate context");`
`1179`	`1181`	`RETURN_FALSE;`