com php-src: Revert "fix datatype and add range check": ext/intl/uchar/uchar.c

From: Date: Tue, 05 Jul 2016 08:35:19 +0000
Subject: com php-src: Revert "fix datatype and add range check": ext/intl/uchar/uchar.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92789@lists.php.net to get a copy of this message
Commit: 41622c86bd0f404c5099822efc696485c033f56d Author: Anatol Belski <ab@php.net> Tue, 5 Jul 2016 10:34:25 +0200 Parents: 818a47c24a90243893e97dbc7c2e833667d5e670 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41622c86bd0f404c5099822efc696485c033f56d Log: Revert "fix datatype and add range check" This reverts commit 14bdd8246c50b55d1ddf838b45de34065e8613c4. Changed paths: M ext/intl/uchar/uchar.c Diff: diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index 272cb22..abb3e59 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -8,17 +8,10 @@ static inline int convert_cp(UChar32* pcp, zval *zcp) { zend_long cp = -1; - - if (ZEND_SIZE_T_INT_OVFL(Z_STRLEN_P(zcp))) { - intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR); - intl_error_set_custom_msg(NULL, "Input string is too long.", 0); - return FAILURE; - } - if (Z_TYPE_P(zcp) == IS_LONG) { cp = Z_LVAL_P(zcp); } else if (Z_TYPE_P(zcp) == IS_STRING) { - int32_t i = 0; + size_t i = 0; U8_NEXT(Z_STRVAL_P(zcp), i, Z_STRLEN_P(zcp), cp); if (i != Z_STRLEN_P(zcp)) { intl_error_set_code(NULL, U_ILLEGAL_ARGUMENT_ERROR);

« previous php.cvs (#92789) next »