From 04bf4b61463c474cfaa9424caa4d8c230501d198 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 30 Apr 2025 23:42:53 +0200
Subject: [PATCH] Fix reference handling of
 IntlTimeZone::getCanonicalID/intltz_get_canonical_id

---
 .../tests/intltz_get_canonical_id_refs.phpt   | 19 +++++++++++++++++++
 ext/intl/timezone/timezone_methods.cpp        |  4 +---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 ext/intl/tests/intltz_get_canonical_id_refs.phpt

diff --git a/ext/intl/tests/intltz_get_canonical_id_refs.phpt b/ext/intl/tests/intltz_get_canonical_id_refs.phpt
new file mode 100644
index 0000000000000..973b7006c7d1a
--- /dev/null
+++ b/ext/intl/tests/intltz_get_canonical_id_refs.phpt
@@ -0,0 +1,19 @@
+--TEST--
+IntlTimeZone::getCanonicalID: refs test
+--EXTENSIONS--
+intl
+--FILE--
+<?php
+class Test {
+    public string $prop = "a";
+}
+$test = new Test;
+$ref =& $test->prop;
+print_R(intltz_get_canonical_id('Portugal', $ref));
+var_dump($test);
+?>
+--EXPECT--
+Europe/Lisbonobject(Test)#1 (1) {
+  ["prop"]=>
+  &string(1) "1"
+}
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index 580a721e79ec1..d360ab3a688ff 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -291,9 +291,7 @@ U_CFUNC PHP_FUNCTION(intltz_get_canonical_id)
 	RETVAL_NEW_STR(u8str);
 
 	if (is_systemid) { /* by-ref argument passed */
-		ZVAL_DEREF(is_systemid);
-		zval_ptr_dtor(is_systemid);
-		ZVAL_BOOL(is_systemid, isSystemID);
+		ZEND_TRY_ASSIGN_REF_BOOL(is_systemid, isSystemID);
 	}
 }