Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix phpGH-17747: Exception on reading property in register-based FETCH_OBJ_R breaks JIT
  Fix phpGH-17745: zlib extension incorrectly handles object arguments

Author: ndossche

ext/opcache/jit/zend_jit_ir.c

@@ -14733,7 +14733,11 @@ static int zend_jit_fetch_obj(zend_jit_ctx         *jit,
 	}
 
 	if (may_throw) {
-		zend_jit_check_exception(jit);
+		if (Z_MODE(res_addr) == IS_REG) {
+			zend_jit_check_exception_undef_result(jit, opline);
+		} else {
+			zend_jit_check_exception(jit);
+		}
 	}
 
 	return 1;

ext/opcache/tests/jit/gh17747.phpt

@@ -0,0 +1,23 @@
+--TEST--
+GH-17747 (Exception on reading property in register-based FETCH_OBJ_R breaks JIT)
+--EXTENSIONS--
+opcache
+--INI--
+opcache.jit=function
+--FILE--
+<?php
+class C {
+    public int $a;
+    public function test() {
+        var_dump($this->a);
+    }
+}
+$test = new C;
+$test->test();
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Typed property C::$a must not be accessed before initialization in %s:%d
+Stack trace:
+#0 %s(%d): C->test()
+#1 {main}
+  thrown in %s on line %d

ext/zlib/tests/gh17745.phpt

@@ -0,0 +1,20 @@
+--TEST--
+GH-17745 (zlib extension incorrectly handles object arguments)
+--EXTENSIONS--
+zlib
+--FILE--
+<?php
+$obj = new stdClass;
+$obj->level = 3;
+var_dump(deflate_init(ZLIB_ENCODING_RAW, $obj));
+
+class Options {
+    public int $level = 3;
+}
+var_dump(deflate_init(ZLIB_ENCODING_RAW, new Options));
+?>
+--EXPECT--
+object(DeflateContext)#2 (0) {
+}
+object(DeflateContext)#3 (0) {
+}

ext/zlib/zlib.c

@@ -790,6 +790,7 @@ static bool zlib_create_dictionary_string(HashTable *options, char **dict, size_
 	zval *option_buffer;
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("dictionary"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		ZVAL_DEREF(option_buffer);
 		switch (Z_TYPE_P(option_buffer)) {
 			case IS_STRING: {
@@ -871,6 +872,7 @@ PHP_FUNCTION(inflate_init)
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("window"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		window = zval_get_long(option_buffer);
 	}
 	if (window < 8 || window > 15) {
@@ -1089,6 +1091,7 @@ PHP_FUNCTION(deflate_init)
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("level"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		level = zval_get_long(option_buffer);
 	}
 	if (level < -1 || level > 9) {
@@ -1097,6 +1100,7 @@ PHP_FUNCTION(deflate_init)
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("memory"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		memory = zval_get_long(option_buffer);
 	}
 	if (memory < 1 || memory > 9) {
@@ -1105,6 +1109,7 @@ PHP_FUNCTION(deflate_init)
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("window"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		window = zval_get_long(option_buffer);
 	}
 	if (window < 8 || window > 15) {
@@ -1113,6 +1118,7 @@ PHP_FUNCTION(deflate_init)
 	}
 
 	if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("strategy"))) != NULL) {
+		ZVAL_DEINDIRECT(option_buffer);
 		strategy = zval_get_long(option_buffer);
 	}
 	switch (strategy) {

ext/zlib/zlib.stub.php

@@ -270,11 +270,11 @@ function gzread($stream, int $length): string|false {}
  */
 function gzgets($stream, ?int $length = null): string|false {}
 
-function deflate_init(int $encoding, array $options = []): DeflateContext|false {}
+function deflate_init(int $encoding, array|object $options = []): DeflateContext|false {}
 
 function deflate_add(DeflateContext $context, string $data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {}
 
-function inflate_init(int $encoding, array $options = []): InflateContext|false {}
+function inflate_init(int $encoding, array|object $options = []): InflateContext|false {}
 
 function inflate_add(InflateContext $context, string $data, int $flush_mode = ZLIB_SYNC_FLUSH): string|false {}