Merge branch 'PHP-8.2'

Author: derickr

.gitattributes

@@ -23,3 +23,6 @@
 **/*_arginfo.h linguist-generated
 /Zend/zend_vm_execute.h linguist-generated
 /Zend/zend_vm_opcodes.{h,c} linguist-generated
+
+# The OSS fuzz files are bunary
+/ext/date/tests/ossfuzz*.txt binary

ext/date/php_date.c

@@ -2735,6 +2735,7 @@ PHP_METHOD(DateTime, __set_state)
 	dateobj = Z_PHPDATE_P(return_value);
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTime object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -2756,6 +2757,7 @@ PHP_METHOD(DateTimeImmutable, __set_state)
 	dateobj = Z_PHPDATE_P(return_value);
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -2818,7 +2820,7 @@ static void restore_custom_datetime_properties(zval *object, HashTable *myht)
 	zval             *prop_val;
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
-		if (date_time_is_internal_property(prop_name)) {
+		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_time_is_internal_property(prop_name)) {
 			continue;
 		}
 		add_property_zval_ex(object, ZSTR_VAL(prop_name), ZSTR_LEN(prop_name), prop_val);
@@ -2842,6 +2844,7 @@ PHP_METHOD(DateTime, __unserialize)
 
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTime object");
+		RETURN_THROWS();
 	}
 
 	restore_custom_datetime_properties(object, myht);
@@ -2865,6 +2868,7 @@ PHP_METHOD(DateTimeImmutable, __unserialize)
 
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
+		RETURN_THROWS();
 	}
 
 	restore_custom_datetime_properties(object, myht);
@@ -3918,7 +3922,7 @@ static void restore_custom_datetimezone_properties(zval *object, HashTable *myht
 	zval             *prop_val;
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
-		if (date_timezone_is_internal_property(prop_name)) {
+		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_timezone_is_internal_property(prop_name)) {
 			continue;
 		}
 		add_property_zval_ex(object, ZSTR_VAL(prop_name), ZSTR_LEN(prop_name), prop_val);
@@ -4545,7 +4549,7 @@ static void restore_custom_dateinterval_properties(zval *object, HashTable *myht
 	zval             *prop_val;
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
-		if (date_interval_is_internal_property(prop_name)) {
+		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_interval_is_internal_property(prop_name)) {
 			continue;
 		}
 		add_property_zval_ex(object, ZSTR_VAL(prop_name), ZSTR_LEN(prop_name), prop_val);
@@ -5545,7 +5549,7 @@ static void restore_custom_dateperiod_properties(zval *object, HashTable *myht)
 	zval             *prop_val;
 
 	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
-		if (date_period_is_internal_property(prop_name)) {
+		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_period_is_internal_property(prop_name)) {
 			continue;
 		}
 		add_property_zval_ex(object, ZSTR_VAL(prop_name), ZSTR_LEN(prop_name), prop_val);

ext/date/tests/ossfuzz-55589.txt

@@ -0,0 +1 @@
+|O:12:"DaTeInterval":2:{i:2;r:1;i:0;R:2;

ext/date/tests/ossfuzz-55599.txt

@@ -0,0 +1 @@
+|O:8:"DateTime":1:{i:1;d:2;

ext/date/tests/ossfuzz-55727.txt

@@ -0,0 +1,39 @@
+--TEST--
+Test DateInterval::__unserialize OSS fuzz issues
+--FILE--
+<?php
+$files = [
+	'ossfuzz-55589.txt',
+	'ossfuzz-55599.txt',
+	'ossfuzz-55727.txt',
+];
+
+foreach ($files as $file) {
+	echo "{$file}: ";
+
+	$s = file_get_contents(__DIR__ . "/{$file}");
+
+	try {
+		$x = unserialize(substr($s, strpos($s, "|") + 1));
+	} catch (Error $e) {
+		echo get_class($e), ': ', $e->getMessage(), "\n";
+	}
+	var_dump($x);
+	echo "\n\n";
+}
+?>
+--EXPECTF--
+ossfuzz-55589.txt: 
+%s: unserialize(): Error at offset 39 of 39 bytes in %sunserialize-test.php on line 14
+bool(false)
+
+
+ossfuzz-55599.txt: 
+%s: unserialize(): Error at offset 26 of 26 bytes in %sunserialize-test.php on line 14
+Error: Invalid serialization data for DateTime object
+bool(false)
+
+
+ossfuzz-55727.txt: 
+%s: unserialize(): Error at offset 230 of 509 bytes in %sunserialize-test.php on line 14
+bool(false)

ext/date/tests/unserialize-test.phpt

@@ -580,8 +580,8 @@ static size_t format_converter(buffy * odp, const char *fmt, va_list ap) /* {{{
 					} else if (*fmt == '*') {
 						precision = va_arg(ap, int);
 						fmt++;
-						if (precision < 0)
-							precision = 0;
+						if (precision < -1)
+							precision = -1;
 					} else
 						precision = 0;
 				} else