clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

intl extension, build fix for icu >= 69.x release. ubrk/ucnv_safeClone had been deprecated in favor of ubrk/ucnv_clone which does not use user provided stacks but remain thread safe.

Browse Source
This commit is contained in:
David Carlier 2022-07-08 13:56:17 +01:00
parent bd6793372b
commit 7c3dfbb845
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -18,6 +18,9 @@ PHP NEWS
. Fixed bug GH-8848 (imagecopyresized() error refers to the wrong argument).
(cmb)
- Intl:
. Fixed build for ICU 69.x and onwards. (David Carlier)
- OPcache:
. Fixed bug GH-8847 (PHP hanging infinitly at 100% cpu when check php
syntaxe of a valid file). (Dmitry)

8
ext/intl/converter/converter.c
View File

@ -933,10 +933,18 @@ static zend_object *php_converter_clone_object(zend_object *object) {
intl_errors_reset(&oldobj->error);
#if U_ICU_VERSION_MAJOR_NUM > 70
objval->src = ucnv_clone(oldobj->src, &error);
#else
objval->src = ucnv_safeClone(oldobj->src, NULL, NULL, &error);
#endif
if (U_SUCCESS(error)) {
error = U_ZERO_ERROR;
#if U_ICU_VERSION_MAJOR_NUM > 70
objval->dest = ucnv_clone(oldobj->dest, &error);
#else
objval->dest = ucnv_safeClone(oldobj->dest, NULL, NULL, &error);
#endif
}
if (U_FAILURE(error)) {
zend_string *err_msg;

8
ext/intl/grapheme/grapheme_util.c
View File

@ -373,8 +373,6 @@ grapheme_strrpos_ascii(char *haystack, size_t haystack_len, char *needle, size_t
/* {{{ grapheme_get_break_iterator: get a clone of the global character break iterator */
UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status )
{
int32_t buffer_size;
UBreakIterator *global_break_iterator = INTL_G( grapheme_iterator );
if ( NULL == global_break_iterator ) {
@ -388,8 +386,12 @@ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *stat
INTL_G(grapheme_iterator) = global_break_iterator;
}
buffer_size = U_BRK_SAFECLONE_BUFFERSIZE;
#if U_ICU_VERSION_MAJOR_NUM >= 69
return ubrk_clone(global_break_iterator, status);
#else
int32_t buffer_size = U_BRK_SAFECLONE_BUFFERSIZE;
return ubrk_safeClone(global_break_iterator, stack_buffer, &buffer_size, status);
#endif
}
/* }}} */