From 3a1ff206e99885fddd5681daf6ebe877f21210d6 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Sun, 27 Apr 2025 00:13:11 +0200
Subject: [PATCH] Fix IntlDateFormatter::parseToCalendar() reference type
 system breaks

---
 ext/intl/dateformat/dateformat_parse.c        | 11 ++++----
 ...arseToCalendar_references_type_system.phpt | 26 +++++++++++++++++++
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 ext/intl/tests/parseToCalendar_references_type_system.phpt

diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c
index 9a1c09b2af79d..eec52ac7f8eb8 100644
--- a/ext/intl/dateformat/dateformat_parse.c
+++ b/ext/intl/dateformat/dateformat_parse.c
@@ -186,12 +186,12 @@ PHP_METHOD(IntlDateFormatter, parseToCalendar)
 	DATE_FORMAT_METHOD_FETCH_OBJECT;
 
 	if (z_parse_pos) {
-		zend_long long_parse_pos;
-		ZVAL_DEREF(z_parse_pos);
+		zval *z_parse_pos_tmp = z_parse_pos;
+		ZVAL_DEREF(z_parse_pos_tmp);
 		bool failed = false;
-		long_parse_pos = zval_try_get_long(z_parse_pos, &failed);
+		zend_long long_parse_pos = zval_try_get_long(z_parse_pos_tmp, &failed);
 		if (failed) {
-			zend_argument_type_error(2, "must be of type int, %s given", zend_zval_value_name(z_parse_pos));
+			zend_argument_type_error(2, "must be of type int, %s given", zend_zval_value_name(z_parse_pos_tmp));
 			RETURN_THROWS();
 		}
 		if (ZEND_LONG_INT_OVFL(long_parse_pos)) {
@@ -206,8 +206,7 @@ PHP_METHOD(IntlDateFormatter, parseToCalendar)
 	}
 	internal_parse_to_timestamp( dfo, ZSTR_VAL(text_to_parse), ZSTR_LEN(text_to_parse), z_parse_pos ? &parse_pos : NULL, true, return_value);
 	if (z_parse_pos) {
-		zval_ptr_dtor(z_parse_pos);
-		ZVAL_LONG(z_parse_pos, parse_pos);
+		ZEND_TRY_ASSIGN_REF_LONG(z_parse_pos, parse_pos);
 	}
 }
 
diff --git a/ext/intl/tests/parseToCalendar_references_type_system.phpt b/ext/intl/tests/parseToCalendar_references_type_system.phpt
new file mode 100644
index 0000000000000..d0cef570842f8
--- /dev/null
+++ b/ext/intl/tests/parseToCalendar_references_type_system.phpt
@@ -0,0 +1,26 @@
+--TEST--
+IntlDateFormatter::parseToCalendar() reference type system breaks
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+class Test {
+    public float $prop = 0.0;
+}
+$test = new Test;
+$offset =& $test->prop;
+
+$oIntlDateFormatter = new IntlDateFormatter("en_GB");
+$oIntlDateFormatter->setTimeZone('Europe/Berlin');
+$oIntlDateFormatter->setPattern('VV');
+var_dump($oIntlDateFormatter->parseToCalendar('America/Los_Angeles', $offset));
+var_dump($offset);
+var_dump($test);
+?>
+--EXPECTF--
+int(%d)
+float(%f)
+object(Test)#%d (1) {
+  ["prop"]=>
+  &float(%f)
+}