com php-src: re-add range check: ext/intl/uchar/uchar.c
| From: | Anatol Belski | Date: | Tue, 05 Jul 2016 13:15:20 +0000 |
| Subject: | com php-src: re-add range check: ext/intl/uchar/uchar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92801@lists.php.net to get a copy of this message | ||
Commit: de643ead3ec0fe256d2b71649ba7d9c84e2e2102
Author: Anatol Belski <ab@php.net> Tue, 5 Jul 2016 12:09:22 +0200
Parents: e395b62c51524427b225323f827efdc46eb0b9b0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de643ead3ec0fe256d2b71649ba7d9c84e2e2102
Log:
re-add range check
Changed paths:
M ext/intl/uchar/uchar.c
Diff:
diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c
index abb3e59..a7e5c17 100644
--- a/ext/intl/uchar/uchar.c
+++ b/ext/intl/uchar/uchar.c
@@ -8,12 +8,21 @@
static inline int convert_cp(UChar32* pcp, zval *zcp) {
zend_long cp = -1;
+
if (Z_TYPE_P(zcp) == IS_LONG) {
cp = Z_LVAL_P(zcp);
} else if (Z_TYPE_P(zcp) == IS_STRING) {
- size_t i = 0;
- U8_NEXT(Z_STRVAL_P(zcp), i, Z_STRLEN_P(zcp), cp);
- if (i != Z_STRLEN_P(zcp)) {
+ int32_t i = 0;
+ size_t zcp_len = Z_STRLEN_P(zcp);
+
+ if (ZEND_SIZE_T_INT_OVFL(zcp_len)) {
+ intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR);
+ intl_error_set_custom_msg(NULL, "Input string is too long.", 0);
+ return FAILURE;
+ }
+
+ U8_NEXT(Z_STRVAL_P(zcp), i, zcp_len, cp);
+ if ((size_t)i != zcp_len) {
intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR);
intl_error_set_custom_msg(NULL, "Passing a UTF-8 character for codepoint requires a string
which is exactly one UTF-8 codepoint long.", 0);
return FAILURE;