Merge branch 'PHP-8.5'

* PHP-8.5:
  zlib: Fix memory leak in inflate_add()
  zlib: no need to free dict on inflate init error

Author: ndossche

ext/zlib/tests/inflate_add_no_dict.phpt

@@ -0,0 +1,22 @@
+--TEST--
+inflate_add(): Z_NEED_DICT returned when no dictionary provided to inflate_init()
+--EXTENSIONS--
+zlib
+--FILE--
+<?php
+
+$dict = "the quick brown fox jumps over the lazy dog";
+$data = "the quick brown fox";
+
+$dc = deflate_init(ZLIB_ENCODING_DEFLATE, ['dictionary' => $dict]);
+$compressed = deflate_add($dc, $data, ZLIB_FINISH);
+
+// Inflate without supplying the dictionary
+$ic = inflate_init(ZLIB_ENCODING_DEFLATE);
+$result = inflate_add($ic, $compressed, ZLIB_SYNC_FLUSH);
+var_dump($result);
+
+?>
+--EXPECTF--
+Warning: inflate_add(): Inflating this data requires a preset dictionary, please specify it in the options array of inflate_init() in %s on line %d
+bool(false)

ext/zlib/zlib.c

@@ -925,7 +925,7 @@ PHP_FUNCTION(inflate_init)
 	}
 
 	if (inflateInit2(&ctx->Z, encoding) != Z_OK) {
-		efree(dict);
+		/* dict is stored in the ctx in the object and will thus be freed by zval_ptr_dtor(). */
 		zval_ptr_dtor(return_value);
 		php_error_docref(NULL, E_WARNING, "Failed allocating zlib.inflate context");
 		RETURN_FALSE;
@@ -1043,6 +1043,7 @@ PHP_FUNCTION(inflate_add)
 					}
 					break;
 				} else {
+					zend_string_release_ex(out, false);
 					php_error_docref(NULL, E_WARNING, "Inflating this data requires a preset dictionary, please specify it in the options array of inflate_init()");
 					RETURN_FALSE;
 				}