]> granicus.if.org Git - php/commitdiff
Revert "fix datatype and add range check"
authorAnatol Belski <ab@php.net>
Tue, 5 Jul 2016 08:34:25 +0000 (10:34 +0200)
committerAnatol Belski <ab@php.net>
Tue, 5 Jul 2016 08:35:19 +0000 (10:35 +0200)
This reverts commit 14bdd8246c50b55d1ddf838b45de34065e8613c4.

ext/intl/uchar/uchar.c

index 272cb22157aff24f75f23e8998c88e51df1260cc..abb3e59671ff8b702717f7684080bd27fd982caa 100644 (file)
@@ -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);