From 44fa68b064118bee068f4d1ccb94b89979b4ec67 Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Mon, 3 Jul 2023 16:41:20 +0100
Subject: [PATCH] =?UTF-8?q?ext/intl:=20intl=5FCharFromString=20using=20zen?=
 =?UTF-8?q?d=5Fstring=5Ftruncate=20to=20adjust=20th=E2=80=A6=20(#11575)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ext/intl: intl_CharFromString using zend_string_truncate to adjust the size of the buffer.
---
 ext/intl/intl_convertcpp.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp
index 43d0d2cdd38..b919c3fb408 100644
--- a/ext/intl/intl_convertcpp.cpp
+++ b/ext/intl/intl_convertcpp.cpp
@@ -79,8 +79,7 @@ zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status)
 		zend_string_free(u8res);
 		return NULL;
 	}
-	ZSTR_VAL(u8res)[actual_len] = '\0';
-	ZSTR_LEN(u8res) = actual_len;
+	u8res = zend_string_truncate(u8res, actual_len, 0);
 
 	return u8res;
 }