Skip to content

ext/intl: Use ICU U16_APPEND_UNSAFE macro for UTF-16 surrogate pair encoding#21954

Merged
devnexen merged 1 commit intophp:masterfrom
LamentXU123:clean-up-intl
May 5, 2026
Merged

ext/intl: Use ICU U16_APPEND_UNSAFE macro for UTF-16 surrogate pair encoding#21954
devnexen merged 1 commit intophp:masterfrom
LamentXU123:clean-up-intl

Conversation

@LamentXU123
Copy link
Copy Markdown
Contributor

Use U16_APPEND_UNSAFE for UTF-16 surrogate pair encoding instead of manually operating pointers.

Small clean-ups :)

@devnexen
Copy link
Copy Markdown
Member

devnexen commented May 5, 2026

since PHP is pre-validating via TARGET_CHECK, this is the right call.

@devnexen devnexen merged commit 608c3ed into php:master May 5, 2026
19 checks passed
bwoebi added a commit to bwoebi/php-src that referenced this pull request May 6, 2026
* 'master' of github.com:php/php-src: (156 commits)
  PHP-8.2 is now for PHP 8.2.32-dev
  [skip ci] Add NEWS entries for 8.2.31 security issues
  Fix mbstring test with oniguruma deprecation
  GHSA-74r9-qxhc-fx53: [mbstring] Fix out-of-bounds access in mbfl_name2encoding_ex()
  GHSA-m8rr-4c36-8gq4: Consistently pass unsigned char to ctype.h functions
  GHSA-96wq-48vp-hh57: [metaphone] Fix signed integer overflow of char array offset
  GHSA-w476-322c-wpvm: [pdo_firebird] Fix SQL injection via NUL bytes in quoted strings
  GHSA-wm6j-2649-pv75: [mbstring] Fix null pointer dereference in php_mb_check_encoding() via mb_ereg_search_init()
  GHSA-7qg2-v9fj-4mwv: [fpm] XSS within status endpoint
  GHSA-hmxp-6pc4-f3vv: [soap] Fix broken Apache map value NULL check
  GHSA-m33r-qmcv-p97q: [soap] Fix use-after-free after header parsing failure with SOAP_PERSISTENCE_SESSION
  GHSA-85c2-q967-79q5: [soap] Fix stale SOAP_GLOBAL(ref_map) pointer with Apache Map
  Fix bad merge
  Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
  Fix compiler warning with GCC 16: variable 'offset' set but not used [-Werror=unused-but-set-variable=]
  Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
  ext/mysqlnd: Use iterated struct and remove dulicate SET_AFFECTED_ROWS (php#21713)
  ext/intl: Use ICU U16_APPEND_UNSAFE macro for UTF-16 surrogate pair encoding (php#21954)
  Fix incorrect trace stop type
  [ci skip] fix NEWS last entry
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants