Commit ffa625db17d for php
commit ffa625db17da955301135fe17fafd72ab1b0f6e0
Merge: c965bc5b36a 54c663789ba
Author: David Carlier <devnexen@gmail.com>
Date: Fri Nov 20 15:46:23 2026 +0000
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
ext/intl: Fix intl_error_name() truncating codes outside the int range
# Conflicts:
# ext/intl/common/common_error.cpp
diff --cc ext/intl/common/common_error.cpp
index 8d0cca52bb7,45b49519914..1cef14cae10
--- a/ext/intl/common/common_error.cpp
+++ b/ext/intl/common/common_error.cpp
@@@ -67,6 -65,10 +67,10 @@@ U_CFUNC PHP_FUNCTION( intl_error_name
Z_PARAM_LONG(err_code)
ZEND_PARSE_PARAMETERS_END();
+ if (err_code < INT32_MIN || err_code > INT32_MAX) {
+ err_code = INT32_MAX;
+ }
+
- RETURN_STRING( (char*)u_errorName( err_code ) );
+ RETURN_STRING( (char*)u_errorName( static_cast<UErrorCode>(err_code) ) );
}
/* }}} */