Merge branch 'PHP-8.4'

* PHP-8.4: Fix memory leak when encoding check fails
php · Feb 13, 2025 · 78d934a · 78d934a
2 parents 55994f8 + 902e01f
commit 78d934a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt b/ext/zlib/tests/leak_invalid_encoding_with_dict.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Memory leak when passing a dictionary with invalid encoding
+--EXTENSIONS--
+zlib
+--FILE--
+<?php
+try {
+	inflate_init(123456, ["dictionary" => "dict"]);
+} catch (ValueError $e) {
+	echo $e->getMessage(), "\n";
+}
+try {
+	deflate_init(123456, ["dictionary" => "dict"]);
+} catch (ValueError $e) {
+	echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Encoding mode must be ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP or ZLIB_ENCODING_DEFLATE
+deflate_init(): Argument #1 ($encoding) must be one of ZLIB_ENCODING_RAW, ZLIB_ENCODING_GZIP, or ZLIB_ENCODING_DEFLATE
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -880,10 +880,6 @@ PHP_FUNCTION(inflate_init)
 		RETURN_THROWS();
 	}
 
-	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
-		RETURN_THROWS();
-	}
-
 	switch (encoding) {
 		case PHP_ZLIB_ENCODING_RAW:
 		case PHP_ZLIB_ENCODING_GZIP:
@@ -894,6 +890,10 @@ PHP_FUNCTION(inflate_init)
 			RETURN_THROWS();
 	}
 
+	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
+		RETURN_THROWS();
+	}
+
 	object_init_ex(return_value, inflate_context_ce);
 	ctx = Z_INFLATE_CONTEXT_P(return_value);
 
@@ -1133,10 +1133,6 @@ PHP_FUNCTION(deflate_init)
 			RETURN_THROWS();
 	}
 
-	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
-		RETURN_THROWS();
-	}
-
 	switch (encoding) {
 		case PHP_ZLIB_ENCODING_RAW:
 		case PHP_ZLIB_ENCODING_GZIP:
@@ -1147,6 +1143,10 @@ PHP_FUNCTION(deflate_init)
 			RETURN_THROWS();
 	}
 
+	if (!zlib_create_dictionary_string(options, &dict, &dictlen)) {
+		RETURN_THROWS();
+	}
+
 	object_init_ex(return_value, deflate_context_ce);
 	ctx = Z_DEFLATE_CONTEXT_P(return_value);