From 13a1b4e47e93a7ba1d87b0e9d313ae62c2409558 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sun, 2 Jul 2023 17:03:24 +0100 Subject: [PATCH 1/2] ext/intl: intl_CharFromString using zend_string_truncate to adjust the size of the buffer. --- ext/intl/intl_convertcpp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp index 43d0d2cdd385e..a385dd72efaad 100644 --- a/ext/intl/intl_convertcpp.cpp +++ b/ext/intl/intl_convertcpp.cpp @@ -79,8 +79,8 @@ zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status) zend_string_free(u8res); return NULL; } + u8res = zend_string_truncate(u8res, actual_len, 0); ZSTR_VAL(u8res)[actual_len] = '\0'; - ZSTR_LEN(u8res) = actual_len; return u8res; } From 0bf21571c44cce37cb801a710821ddbd8e8f1baa Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Mon, 3 Jul 2023 12:47:06 +0100 Subject: [PATCH 2/2] changes from feedback --- ext/intl/intl_convertcpp.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/intl/intl_convertcpp.cpp b/ext/intl/intl_convertcpp.cpp index a385dd72efaad..b919c3fb40876 100644 --- a/ext/intl/intl_convertcpp.cpp +++ b/ext/intl/intl_convertcpp.cpp @@ -80,7 +80,6 @@ zend_string* intl_charFromString(const UnicodeString &from, UErrorCode *status) return NULL; } u8res = zend_string_truncate(u8res, actual_len, 0); - ZSTR_VAL(u8res)[actual_len] = '\0'; return u8res; }