com php-src: ext/intl further fixes: ext/intl/grapheme/grapheme _string.c ext/intl/grapheme/grapheme_util.c ext/int l/grapheme/grapheme_util.h
ext/intl/idn/idn.c ext/int l/normalizer/normalizer_normalize.c ext/intl/resourcebund le/resourcebundle_class.c ext/intl/spoofchecker/spoofchec
ker_main.c
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:14:22 +0000 |
| Subject: | com php-src: ext/intl further fixes: ext/intl/grapheme/grapheme _string.c ext/intl/grapheme/grapheme_util.c ext/int l/grapheme/grapheme_util.h ext/intl/idn/idn.c ext/int l/normalizer/normalizer_normalize.c ext/intl/resourcebund le/resourcebundle_class.c ext/intl/spoofchecker/spoofchec ker_main.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73452@lists.php.net to get a copy of this message | ||
Commit: 68ec5a9b894825ab0d2aba07ae5e015e1ce6897f
Author: Anatol Belski <ab@php.net> Mon, 26 Aug 2013 04:33:07 -0700
Parents: 866d33e1e96f3bfa15d2f3f1c095bc54e4eef71f
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=68ec5a9b894825ab0d2aba07ae5e015e1ce6897f
Log:
ext/intl further fixes
Changed paths:
M ext/intl/grapheme/grapheme_string.c
M ext/intl/grapheme/grapheme_util.c
M ext/intl/grapheme/grapheme_util.h
M ext/intl/idn/idn.c
M ext/intl/normalizer/normalizer_normalize.c
M ext/intl/resourcebundle/resourcebundle_class.c
M ext/intl/spoofchecker/spoofchecker_main.c
diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 8a094e0..4538b33 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -55,13 +55,13 @@ void grapheme_register_constants( INIT_FUNC_ARGS ) PHP_FUNCTION(grapheme_strlen) { unsigned char* string; - int string_len; + zend_str_size_int string_len; UChar* ustring = NULL; - int ustring_len = 0; + zend_str_size_int ustring_len = 0; int ret_len; UErrorCode status; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", (char **)&string, &string_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", (char **)&string, &string_len) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strlen: unable to parse input param", 0 TSRMLS_CC ); @@ -69,10 +69,9 @@ PHP_FUNCTION(grapheme_strlen) RETURN_FALSE; } - ret_len = grapheme_ascii_check(string, string_len); - - if ( ret_len >= 0 ) - RETURN_LONG(ret_len); + if (grapheme_ascii_check(string, string_len)) { + RETURN_LONG(string_len); + } /* convert the string to UTF-16. */ status = U_ZERO_ERROR; @@ -109,13 +108,13 @@ PHP_FUNCTION(grapheme_strlen) PHP_FUNCTION(grapheme_strpos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; unsigned char *found; long loffset = 0; int32_t offset = 0; int ret_pos; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strpos: unable to parse input param", 0 TSRMLS_CC ); @@ -154,7 +153,7 @@ PHP_FUNCTION(grapheme_strpos) } /* if it is there, and if the haystack is ascii, we are all done */ - if ( grapheme_ascii_check(haystack, haystack_len) >= 0 ) { + if (grapheme_ascii_check(haystack, haystack_len)) { RETURN_LONG(found - haystack); } @@ -176,14 +175,14 @@ PHP_FUNCTION(grapheme_strpos) PHP_FUNCTION(grapheme_stripos) { unsigned char *haystack, *needle, *haystack_dup, *needle_dup; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; unsigned char *found; long loffset = 0; int32_t offset = 0; int ret_pos; int is_ascii; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_stripos: unable to parse input param", 0 TSRMLS_CC ); @@ -211,7 +210,7 @@ PHP_FUNCTION(grapheme_stripos) } - is_ascii = ( grapheme_ascii_check(haystack, haystack_len) >= 0 ); + is_ascii = grapheme_ascii_check(haystack, haystack_len); if ( is_ascii ) { needle_dup = (unsigned char *)estrndup((char *)needle, needle_len); @@ -229,7 +228,7 @@ PHP_FUNCTION(grapheme_stripos) } /* if needle was ascii too, we are all done, otherwise we need to try using Unicode to see what we get */ - if ( grapheme_ascii_check(needle, needle_len) >= 0 ) { + if ( grapheme_ascii_check(needle, needle_len) ) { RETURN_FALSE; } } @@ -251,13 +250,13 @@ PHP_FUNCTION(grapheme_stripos) PHP_FUNCTION(grapheme_strrpos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; long loffset = 0; int32_t offset = 0; int32_t ret_pos; int is_ascii; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strrpos: unable to parse input param", 0 TSRMLS_CC ); @@ -284,7 +283,7 @@ PHP_FUNCTION(grapheme_strrpos) RETURN_FALSE; } - is_ascii = grapheme_ascii_check(haystack, haystack_len) >= 0; + is_ascii = grapheme_ascii_check(haystack, haystack_len); if ( is_ascii ) { @@ -297,7 +296,7 @@ PHP_FUNCTION(grapheme_strrpos) /* if the needle was ascii too, we are done */ - if ( grapheme_ascii_check(needle, needle_len) >= 0 ) { + if ( grapheme_ascii_check(needle, needle_len) ) { RETURN_FALSE; } @@ -321,13 +320,13 @@ PHP_FUNCTION(grapheme_strrpos) PHP_FUNCTION(grapheme_strripos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; long loffset = 0; int32_t offset = 0; int32_t ret_pos; int is_ascii; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strrpos: unable to parse input param", 0 TSRMLS_CC ); @@ -354,7 +353,7 @@ PHP_FUNCTION(grapheme_strripos) RETURN_FALSE; } - is_ascii = grapheme_ascii_check(haystack, haystack_len) >= 0; + is_ascii = grapheme_ascii_check(haystack, haystack_len); if ( is_ascii ) { unsigned char *needle_dup, *haystack_dup; @@ -375,7 +374,7 @@ PHP_FUNCTION(grapheme_strripos) /* if the needle was ascii too, we are done */ - if ( grapheme_ascii_check(needle, needle_len) >= 0 ) { + if ( grapheme_ascii_check(needle, needle_len) ) { RETURN_FALSE; } @@ -400,7 +399,7 @@ PHP_FUNCTION(grapheme_substr) { unsigned char *str, *sub_str; UChar *ustr; - int str_len, sub_str_len, ustr_len; + zend_str_size_int str_len, sub_str_len, ustr_len; long lstart = 0, length = 0; int32_t start = 0; int iter_val; @@ -410,7 +409,7 @@ PHP_FUNCTION(grapheme_substr) int sub_str_start_pos, sub_str_end_pos; int32_t (*iter_func)(UBreakIterator *); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l", (char **)&str, &str_len, &lstart, &length) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|l", (char **)&str, &str_len, &lstart, &length) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_substr: unable to parse input param", 0 TSRMLS_CC ); @@ -430,7 +429,7 @@ PHP_FUNCTION(grapheme_substr) /* the offset is 'grapheme count offset' so it still might be invalid - we'll check it later */ - if ( grapheme_ascii_check(str, str_len) >= 0 ) { + if ( grapheme_ascii_check(str, str_len) ) { grapheme_substr_ascii((char *)str, str_len, start, length, ZEND_NUM_ARGS(), (char **) &sub_str, &sub_str_len); if ( NULL == sub_str ) { @@ -613,11 +612,11 @@ PHP_FUNCTION(grapheme_substr) static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_case) { unsigned char *haystack, *needle, *found; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; int ret_pos, uchar_pos; zend_bool part = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &part) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|b", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &part) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strstr: unable to parse input param", 0 TSRMLS_CC ); @@ -646,7 +645,7 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas } /* if it is there, and if the haystack is ascii, we are all done */ - if ( grapheme_ascii_check(haystack, haystack_len) >= 0 ) { + if ( grapheme_ascii_check(haystack, haystack_len) ) { size_t found_offset = found - haystack; if (part) { @@ -810,7 +809,7 @@ PHP_FUNCTION(grapheme_extract) { unsigned char *str, *pstr; UChar *ustr; - int str_len, ustr_len; + zend_str_size_int str_len, ustr_len; long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */ long lstart = 0; /* starting position in str in bytes */ int32_t start = 0; @@ -821,7 +820,7 @@ PHP_FUNCTION(grapheme_extract) int ret_pos; zval *next = NULL; /* return offset of next part of the string */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|llz", (char **)&str, &str_len, &size, &extract_type, &lstart, &next) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|llz", (char **)&str, &str_len, &size, &extract_type, &lstart, &next) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: unable to parse input param", 0 TSRMLS_CC ); @@ -890,7 +889,7 @@ PHP_FUNCTION(grapheme_extract) (size + 1 because the size-th character might be the beginning of a grapheme cluster) */ - if ( -1 != grapheme_ascii_check(pstr, size + 1 < str_len ? size + 1 : str_len ) ) { + if ( grapheme_ascii_check(pstr, size + 1 < str_len ? size + 1 : str_len ) ) { long nsize = ( size < str_len ? size : str_len ); if ( NULL != next ) { ZVAL_LONG(next, start+nsize); diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index c752b02..ac690a7 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -48,26 +48,27 @@ grapheme_close_global_iterator( TSRMLS_D ) } /* }}} */ +/* XXX that's the same mess we have in substr(), revise it with care when int64 is integrated and get rid of this ugly casts */ /* {{{ grapheme_substr_ascii f='from' - starting point, l='length' */ -void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char **sub_str, int *sub_str_len) +void grapheme_substr_ascii(char *str, zend_str_size_int str_len, long f, long l, int argc, char **sub_str, zend_str_size_int *sub_str_len) { *sub_str = NULL; if (argc > 2) { if ((l < 0 && -l > str_len)) { return; - } else if (l > str_len) { + } else if (l > (long)str_len) { l = str_len; } } else { l = str_len; } - if (f > str_len || (f < 0 && -f > str_len)) { + if (f > (long)str_len || (f < 0 && -f > str_len)) { return; } - if (l < 0 && (l + str_len - f) < 0) { + if (l < 0 && (l + (long)str_len - f) < 0) { return; } @@ -75,7 +76,7 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char * of the string */ if (f < 0) { - f = str_len + f; + f = (long)str_len + f; if (f < 0) { f = 0; } @@ -86,17 +87,17 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char * needed to stop that many chars from the end of the string */ if (l < 0) { - l = (str_len - f) + l; + l = ((long)str_len - f) + l; if (l < 0) { l = 0; } } - if (f >= str_len) { + if (f >= (long)str_len) { return; } - if ((f + l) > str_len) { + if ((f + l) > (long)str_len) { l = str_len - f; } @@ -131,7 +132,8 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case, int last TSRMLS_DC) { UChar *uhaystack = NULL, *uneedle = NULL; - int32_t uhaystack_len = 0, uneedle_len = 0, char_pos, ret_pos, offset_pos = 0; + zend_str_size_int uhaystack_len = 0, uneedle_len = 0; + int32_t char_pos, ret_pos, offset_pos = 0; unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE]; UBreakIterator* bi = NULL; UErrorCode status; @@ -217,15 +219,17 @@ int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigne /* }}} */ /* {{{ grapheme_ascii_check: ASCII check */ -int grapheme_ascii_check(const unsigned char *day, int32_t len) +int grapheme_ascii_check(const unsigned char *day, zend_str_size_int len) { - int ret_len = len; - while ( len-- ) { - if ( *day++ > 0x7f ) - return -1; + zend_str_size_int i = 0; + + while ( i++ < len ) { + if ( *day++ > 0x7f ) { + return 0; + } } - return ret_len; + return 1; } /* }}} */ diff --git a/ext/intl/grapheme/grapheme_util.h b/ext/intl/grapheme/grapheme_util.h index 14f3f22..08c9620 100644 --- a/ext/intl/grapheme/grapheme_util.h +++ b/ext/intl/grapheme/grapheme_util.h @@ -23,13 +23,13 @@ /* get_break_interator: get a break iterator from the global structure */ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC ); -void grapheme_substr_ascii(char *str, int32_t str_len, int32_t f, int32_t l, int argc, char **sub_str, int *sub_str_len); +void grapheme_substr_ascii(char *str, zend_str_size_int str_len, long f, long l, int argc, char **sub_str, zend_str_size_int *sub_str_len); int grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int f_ignore_case TSRMLS_DC); int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int *puchar_pos, int f_ignore_case, int last TSRMLS_DC); -int grapheme_ascii_check(const unsigned char *day, int32_t len); +int grapheme_ascii_check(const unsigned char *day, zend_str_size_int len); int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_array[], int boundary_array_len TSRMLS_DC ); diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 6332488..dad766d 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -202,15 +202,15 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS, #endif static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, - const char *domain, int domain_len, uint32_t option, int mode) + const char *domain, zend_str_size_int domain_len, uint32_t option, int mode) { UChar* ustring = NULL; - int ustring_len = 0; + zend_str_size_int ustring_len = 0; UErrorCode status; char *converted_utf8; - int32_t converted_utf8_len; + zend_str_size_int converted_utf8_len; UChar converted[MAXPATHLEN]; - int32_t converted_ret_len; + zend_str_size_int converted_ret_len; /* convert the string to UTF-16. */ status = U_ZERO_ERROR; @@ -262,14 +262,14 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode) { char *domain; - int domain_len; + zend_str_size_int domain_len; long option = 0, variant = INTL_IDN_VARIANT_2003; zval *idna_info = NULL; intl_error_reset(NULL TSRMLS_CC); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|llz", + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|llz", &domain, &domain_len, &option, &variant, &idna_info) == FAILURE) { php_intl_bad_args("bad arguments", mode TSRMLS_CC); RETURN_NULL(); /* don't set FALSE because that's not the way it was before... */ diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index f46285e..a236606 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -35,25 +35,25 @@ PHP_FUNCTION( normalizer_normalize ) char* input = NULL; /* form is optional, defaults to FORM_C */ long form = NORMALIZER_DEFAULT; - int input_len = 0; + zend_str_size_int input_len = 0; UChar* uinput = NULL; - int uinput_len = 0; + zend_str_size_int uinput_len = 0; int expansion_factor = 1; UErrorCode status = U_ZERO_ERROR; UChar* uret_buf = NULL; - int uret_len = 0; + zend_str_size_int uret_len = 0; char* ret_buf = NULL; - int32_t ret_len = 0; + zend_str_size_int ret_len = 0; int32_t size_needed; intl_error_reset( NULL TSRMLS_CC ); /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l", + if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|l", &input, &input_len, &form ) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, @@ -173,10 +173,10 @@ PHP_FUNCTION( normalizer_is_normalized ) char* input = NULL; /* form is optional, defaults to FORM_C */ long form = NORMALIZER_DEFAULT; - int input_len = 0; + zend_str_size_int input_len = 0; UChar* uinput = NULL; - int uinput_len = 0; + zend_str_size_int uinput_len = 0; UErrorCode status = U_ZERO_ERROR; UBool uret = FALSE; @@ -184,7 +184,7 @@ PHP_FUNCTION( normalizer_is_normalized ) intl_error_reset( NULL TSRMLS_CC ); /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l", + if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|l", &input, &input_len, &form) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index dc12124..3b27fe9 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -80,9 +80,9 @@ static zend_object_value ResourceBundle_object_create( zend_class_entry *ce TSRM static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS) { const char *bundlename; - int bundlename_len = 0; + zend_str_size_int bundlename_len = 0; const char *locale; - int locale_len = 0; + zend_str_size_int locale_len = 0; zend_bool fallback = 1; zval *object = return_value; @@ -90,7 +90,7 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS) intl_error_reset( NULL TSRMLS_CC ); - if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s!s!|b", + if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "S!S!|b", &locale, &locale_len, &bundlename, &bundlename_len, &fallback ) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, @@ -312,7 +312,7 @@ ZEND_END_ARG_INFO() PHP_FUNCTION( resourcebundle_locales ) { char * bundlename; - int bundlename_len = 0; + zend_str_size_int bundlename_len = 0; const char * entry; int entry_len; UEnumeration *icuenum; @@ -320,7 +320,7 @@ PHP_FUNCTION( resourcebundle_locales ) intl_errors_reset( NULL TSRMLS_CC ); - if( zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &bundlename, &bundlename_len ) == FAILURE ) + if( zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &bundlename, &bundlename_len ) == FAILURE ) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "resourcebundle_locales: unable to parse input params", 0 TSRMLS_CC); diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c index c37b918..f0c1c94 100644 --- a/ext/intl/spoofchecker/spoofchecker_main.c +++ b/ext/intl/spoofchecker/spoofchecker_main.c @@ -28,11 +28,11 @@ PHP_METHOD(Spoofchecker, isSuspicious) { int ret; char *text; - int text_len; + zend_str_size_int text_len; zval *error_code = NULL; SPOOFCHECKER_METHOD_INIT_VARS; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &text, &text_len, &error_code)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|z", &text, &text_len, &error_code)) { return; } @@ -60,11 +60,11 @@ PHP_METHOD(Spoofchecker, areConfusable) { int ret; char *s1, *s2; - int s1_len, s2_len; + zend_str_size_int s1_len, s2_len; zval *error_code = NULL; SPOOFCHECKER_METHOD_INIT_VARS; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &s1, &s1_len, + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|z", &s1, &s1_len, &s2, &s2_len, &error_code)) { return; } @@ -92,10 +92,10 @@ PHP_METHOD(Spoofchecker, areConfusable) PHP_METHOD(Spoofchecker, setAllowedLocales) { char *locales; - int locales_len; + zend_str_size_int locales_len; SPOOFCHECKER_METHOD_INIT_VARS; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &locales, &locales_len)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &locales, &locales_len)) { return; }
diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 8a094e0..4538b33 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -55,13 +55,13 @@ void grapheme_register_constants( INIT_FUNC_ARGS ) PHP_FUNCTION(grapheme_strlen) { unsigned char* string; - int string_len; + zend_str_size_int string_len; UChar* ustring = NULL; - int ustring_len = 0; + zend_str_size_int ustring_len = 0; int ret_len; UErrorCode status; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", (char **)&string, &string_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", (char **)&string, &string_len) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strlen: unable to parse input param", 0 TSRMLS_CC ); @@ -69,10 +69,9 @@ PHP_FUNCTION(grapheme_strlen) RETURN_FALSE; } - ret_len = grapheme_ascii_check(string, string_len); - - if ( ret_len >= 0 ) - RETURN_LONG(ret_len); + if (grapheme_ascii_check(string, string_len)) { + RETURN_LONG(string_len); + } /* convert the string to UTF-16. */ status = U_ZERO_ERROR; @@ -109,13 +108,13 @@ PHP_FUNCTION(grapheme_strlen) PHP_FUNCTION(grapheme_strpos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; unsigned char *found; long loffset = 0; int32_t offset = 0; int ret_pos; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strpos: unable to parse input param", 0 TSRMLS_CC ); @@ -154,7 +153,7 @@ PHP_FUNCTION(grapheme_strpos) } /* if it is there, and if the haystack is ascii, we are all done */ - if ( grapheme_ascii_check(haystack, haystack_len) >= 0 ) { + if (grapheme_ascii_check(haystack, haystack_len)) { RETURN_LONG(found - haystack); } @@ -176,14 +175,14 @@ PHP_FUNCTION(grapheme_strpos) PHP_FUNCTION(grapheme_stripos) { unsigned char *haystack, *needle, *haystack_dup, *needle_dup; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; unsigned char *found; long loffset = 0; int32_t offset = 0; int ret_pos; int is_ascii; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_stripos: unable to parse input param", 0 TSRMLS_CC ); @@ -211,7 +210,7 @@ PHP_FUNCTION(grapheme_stripos) } - is_ascii = ( grapheme_ascii_check(haystack, haystack_len) >= 0 ); + is_ascii = grapheme_ascii_check(haystack, haystack_len); if ( is_ascii ) { needle_dup = (unsigned char *)estrndup((char *)needle, needle_len); @@ -229,7 +228,7 @@ PHP_FUNCTION(grapheme_stripos) } /* if needle was ascii too, we are all done, otherwise we need to try using Unicode to see what we get */ - if ( grapheme_ascii_check(needle, needle_len) >= 0 ) { + if ( grapheme_ascii_check(needle, needle_len) ) { RETURN_FALSE; } } @@ -251,13 +250,13 @@ PHP_FUNCTION(grapheme_stripos) PHP_FUNCTION(grapheme_strrpos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; long loffset = 0; int32_t offset = 0; int32_t ret_pos; int is_ascii; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strrpos: unable to parse input param", 0 TSRMLS_CC ); @@ -284,7 +283,7 @@ PHP_FUNCTION(grapheme_strrpos) RETURN_FALSE; } - is_ascii = grapheme_ascii_check(haystack, haystack_len) >= 0; + is_ascii = grapheme_ascii_check(haystack, haystack_len); if ( is_ascii ) { @@ -297,7 +296,7 @@ PHP_FUNCTION(grapheme_strrpos) /* if the needle was ascii too, we are done */ - if ( grapheme_ascii_check(needle, needle_len) >= 0 ) { + if ( grapheme_ascii_check(needle, needle_len) ) { RETURN_FALSE; } @@ -321,13 +320,13 @@ PHP_FUNCTION(grapheme_strrpos) PHP_FUNCTION(grapheme_strripos) { unsigned char *haystack, *needle; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; long loffset = 0; int32_t offset = 0; int32_t ret_pos; int is_ascii; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strrpos: unable to parse input param", 0 TSRMLS_CC ); @@ -354,7 +353,7 @@ PHP_FUNCTION(grapheme_strripos) RETURN_FALSE; } - is_ascii = grapheme_ascii_check(haystack, haystack_len) >= 0; + is_ascii = grapheme_ascii_check(haystack, haystack_len); if ( is_ascii ) { unsigned char *needle_dup, *haystack_dup; @@ -375,7 +374,7 @@ PHP_FUNCTION(grapheme_strripos) /* if the needle was ascii too, we are done */ - if ( grapheme_ascii_check(needle, needle_len) >= 0 ) { + if ( grapheme_ascii_check(needle, needle_len) ) { RETURN_FALSE; } @@ -400,7 +399,7 @@ PHP_FUNCTION(grapheme_substr) { unsigned char *str, *sub_str; UChar *ustr; - int str_len, sub_str_len, ustr_len; + zend_str_size_int str_len, sub_str_len, ustr_len; long lstart = 0, length = 0; int32_t start = 0; int iter_val; @@ -410,7 +409,7 @@ PHP_FUNCTION(grapheme_substr) int sub_str_start_pos, sub_str_end_pos; int32_t (*iter_func)(UBreakIterator *); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l", (char **)&str, &str_len, &lstart, &length) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|l", (char **)&str, &str_len, &lstart, &length) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_substr: unable to parse input param", 0 TSRMLS_CC ); @@ -430,7 +429,7 @@ PHP_FUNCTION(grapheme_substr) /* the offset is 'grapheme count offset' so it still might be invalid - we'll check it later */ - if ( grapheme_ascii_check(str, str_len) >= 0 ) { + if ( grapheme_ascii_check(str, str_len) ) { grapheme_substr_ascii((char *)str, str_len, start, length, ZEND_NUM_ARGS(), (char **) &sub_str, &sub_str_len); if ( NULL == sub_str ) { @@ -613,11 +612,11 @@ PHP_FUNCTION(grapheme_substr) static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_case) { unsigned char *haystack, *needle, *found; - int haystack_len, needle_len; + zend_str_size_int haystack_len, needle_len; int ret_pos, uchar_pos; zend_bool part = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &part) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|b", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &part) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strstr: unable to parse input param", 0 TSRMLS_CC ); @@ -646,7 +645,7 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas } /* if it is there, and if the haystack is ascii, we are all done */ - if ( grapheme_ascii_check(haystack, haystack_len) >= 0 ) { + if ( grapheme_ascii_check(haystack, haystack_len) ) { size_t found_offset = found - haystack; if (part) { @@ -810,7 +809,7 @@ PHP_FUNCTION(grapheme_extract) { unsigned char *str, *pstr; UChar *ustr; - int str_len, ustr_len; + zend_str_size_int str_len, ustr_len; long size; /* maximum number of grapheme clusters, bytes, or characters (based on extract_type) to return */ long lstart = 0; /* starting position in str in bytes */ int32_t start = 0; @@ -821,7 +820,7 @@ PHP_FUNCTION(grapheme_extract) int ret_pos; zval *next = NULL; /* return offset of next part of the string */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|llz", (char **)&str, &str_len, &size, &extract_type, &lstart, &next) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sl|llz", (char **)&str, &str_len, &size, &extract_type, &lstart, &next) == FAILURE) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: unable to parse input param", 0 TSRMLS_CC ); @@ -890,7 +889,7 @@ PHP_FUNCTION(grapheme_extract) (size + 1 because the size-th character might be the beginning of a grapheme cluster) */ - if ( -1 != grapheme_ascii_check(pstr, size + 1 < str_len ? size + 1 : str_len ) ) { + if ( grapheme_ascii_check(pstr, size + 1 < str_len ? size + 1 : str_len ) ) { long nsize = ( size < str_len ? size : str_len ); if ( NULL != next ) { ZVAL_LONG(next, start+nsize); diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index c752b02..ac690a7 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -48,26 +48,27 @@ grapheme_close_global_iterator( TSRMLS_D ) } /* }}} */ +/* XXX that's the same mess we have in substr(), revise it with care when int64 is integrated and get rid of this ugly casts */ /* {{{ grapheme_substr_ascii f='from' - starting point, l='length' */ -void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char **sub_str, int *sub_str_len) +void grapheme_substr_ascii(char *str, zend_str_size_int str_len, long f, long l, int argc, char **sub_str, zend_str_size_int *sub_str_len) { *sub_str = NULL; if (argc > 2) { if ((l < 0 && -l > str_len)) { return; - } else if (l > str_len) { + } else if (l > (long)str_len) { l = str_len; } } else { l = str_len; } - if (f > str_len || (f < 0 && -f > str_len)) { + if (f > (long)str_len || (f < 0 && -f > str_len)) { return; } - if (l < 0 && (l + str_len - f) < 0) { + if (l < 0 && (l + (long)str_len - f) < 0) { return; } @@ -75,7 +76,7 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char * of the string */ if (f < 0) { - f = str_len + f; + f = (long)str_len + f; if (f < 0) { f = 0; } @@ -86,17 +87,17 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char * needed to stop that many chars from the end of the string */ if (l < 0) { - l = (str_len - f) + l; + l = ((long)str_len - f) + l; if (l < 0) { l = 0; } } - if (f >= str_len) { + if (f >= (long)str_len) { return; } - if ((f + l) > str_len) { + if ((f + l) > (long)str_len) { l = str_len - f; } @@ -131,7 +132,8 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case, int last TSRMLS_DC) { UChar *uhaystack = NULL, *uneedle = NULL; - int32_t uhaystack_len = 0, uneedle_len = 0, char_pos, ret_pos, offset_pos = 0; + zend_str_size_int uhaystack_len = 0, uneedle_len = 0; + int32_t char_pos, ret_pos, offset_pos = 0; unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE]; UBreakIterator* bi = NULL; UErrorCode status; @@ -217,15 +219,17 @@ int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigne /* }}} */ /* {{{ grapheme_ascii_check: ASCII check */ -int grapheme_ascii_check(const unsigned char *day, int32_t len) +int grapheme_ascii_check(const unsigned char *day, zend_str_size_int len) { - int ret_len = len; - while ( len-- ) { - if ( *day++ > 0x7f ) - return -1; + zend_str_size_int i = 0; + + while ( i++ < len ) { + if ( *day++ > 0x7f ) { + return 0; + } } - return ret_len; + return 1; } /* }}} */ diff --git a/ext/intl/grapheme/grapheme_util.h b/ext/intl/grapheme/grapheme_util.h index 14f3f22..08c9620 100644 --- a/ext/intl/grapheme/grapheme_util.h +++ b/ext/intl/grapheme/grapheme_util.h @@ -23,13 +23,13 @@ /* get_break_interator: get a break iterator from the global structure */ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC ); -void grapheme_substr_ascii(char *str, int32_t str_len, int32_t f, int32_t l, int argc, char **sub_str, int *sub_str_len); +void grapheme_substr_ascii(char *str, zend_str_size_int str_len, long f, long l, int argc, char **sub_str, zend_str_size_int *sub_str_len); int grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int f_ignore_case TSRMLS_DC); int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int *puchar_pos, int f_ignore_case, int last TSRMLS_DC); -int grapheme_ascii_check(const unsigned char *day, int32_t len); +int grapheme_ascii_check(const unsigned char *day, zend_str_size_int len); int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_array[], int boundary_array_len TSRMLS_DC ); diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 6332488..dad766d 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -202,15 +202,15 @@ static void php_intl_idn_to_46(INTERNAL_FUNCTION_PARAMETERS, #endif static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, - const char *domain, int domain_len, uint32_t option, int mode) + const char *domain, zend_str_size_int domain_len, uint32_t option, int mode) { UChar* ustring = NULL; - int ustring_len = 0; + zend_str_size_int ustring_len = 0; UErrorCode status; char *converted_utf8; - int32_t converted_utf8_len; + zend_str_size_int converted_utf8_len; UChar converted[MAXPATHLEN]; - int32_t converted_ret_len; + zend_str_size_int converted_ret_len; /* convert the string to UTF-16. */ status = U_ZERO_ERROR; @@ -262,14 +262,14 @@ static void php_intl_idn_to(INTERNAL_FUNCTION_PARAMETERS, static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode) { char *domain; - int domain_len; + zend_str_size_int domain_len; long option = 0, variant = INTL_IDN_VARIANT_2003; zval *idna_info = NULL; intl_error_reset(NULL TSRMLS_CC); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|llz", + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|llz", &domain, &domain_len, &option, &variant, &idna_info) == FAILURE) { php_intl_bad_args("bad arguments", mode TSRMLS_CC); RETURN_NULL(); /* don't set FALSE because that's not the way it was before... */ diff --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c index f46285e..a236606 100644 --- a/ext/intl/normalizer/normalizer_normalize.c +++ b/ext/intl/normalizer/normalizer_normalize.c @@ -35,25 +35,25 @@ PHP_FUNCTION( normalizer_normalize ) char* input = NULL; /* form is optional, defaults to FORM_C */ long form = NORMALIZER_DEFAULT; - int input_len = 0; + zend_str_size_int input_len = 0; UChar* uinput = NULL; - int uinput_len = 0; + zend_str_size_int uinput_len = 0; int expansion_factor = 1; UErrorCode status = U_ZERO_ERROR; UChar* uret_buf = NULL; - int uret_len = 0; + zend_str_size_int uret_len = 0; char* ret_buf = NULL; - int32_t ret_len = 0; + zend_str_size_int ret_len = 0; int32_t size_needed; intl_error_reset( NULL TSRMLS_CC ); /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l", + if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|l", &input, &input_len, &form ) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, @@ -173,10 +173,10 @@ PHP_FUNCTION( normalizer_is_normalized ) char* input = NULL; /* form is optional, defaults to FORM_C */ long form = NORMALIZER_DEFAULT; - int input_len = 0; + zend_str_size_int input_len = 0; UChar* uinput = NULL; - int uinput_len = 0; + zend_str_size_int uinput_len = 0; UErrorCode status = U_ZERO_ERROR; UBool uret = FALSE; @@ -184,7 +184,7 @@ PHP_FUNCTION( normalizer_is_normalized ) intl_error_reset( NULL TSRMLS_CC ); /* Parse parameters. */ - if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "s|l", + if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "S|l", &input, &input_len, &form) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index dc12124..3b27fe9 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -80,9 +80,9 @@ static zend_object_value ResourceBundle_object_create( zend_class_entry *ce TSRM static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS) { const char *bundlename; - int bundlename_len = 0; + zend_str_size_int bundlename_len = 0; const char *locale; - int locale_len = 0; + zend_str_size_int locale_len = 0; zend_bool fallback = 1; zval *object = return_value; @@ -90,7 +90,7 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS) intl_error_reset( NULL TSRMLS_CC ); - if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "s!s!|b", + if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "S!S!|b", &locale, &locale_len, &bundlename, &bundlename_len, &fallback ) == FAILURE ) { intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, @@ -312,7 +312,7 @@ ZEND_END_ARG_INFO() PHP_FUNCTION( resourcebundle_locales ) { char * bundlename; - int bundlename_len = 0; + zend_str_size_int bundlename_len = 0; const char * entry; int entry_len; UEnumeration *icuenum; @@ -320,7 +320,7 @@ PHP_FUNCTION( resourcebundle_locales ) intl_errors_reset( NULL TSRMLS_CC ); - if( zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &bundlename, &bundlename_len ) == FAILURE ) + if( zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &bundlename, &bundlename_len ) == FAILURE ) { intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "resourcebundle_locales: unable to parse input params", 0 TSRMLS_CC); diff --git a/ext/intl/spoofchecker/spoofchecker_main.c b/ext/intl/spoofchecker/spoofchecker_main.c index c37b918..f0c1c94 100644 --- a/ext/intl/spoofchecker/spoofchecker_main.c +++ b/ext/intl/spoofchecker/spoofchecker_main.c @@ -28,11 +28,11 @@ PHP_METHOD(Spoofchecker, isSuspicious) { int ret; char *text; - int text_len; + zend_str_size_int text_len; zval *error_code = NULL; SPOOFCHECKER_METHOD_INIT_VARS; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &text, &text_len, &error_code)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|z", &text, &text_len, &error_code)) { return; } @@ -60,11 +60,11 @@ PHP_METHOD(Spoofchecker, areConfusable) { int ret; char *s1, *s2; - int s1_len, s2_len; + zend_str_size_int s1_len, s2_len; zval *error_code = NULL; SPOOFCHECKER_METHOD_INIT_VARS; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &s1, &s1_len, + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|z", &s1, &s1_len, &s2, &s2_len, &error_code)) { return; } @@ -92,10 +92,10 @@ PHP_METHOD(Spoofchecker, areConfusable) PHP_METHOD(Spoofchecker, setAllowedLocales) { char *locales; - int locales_len; + zend_str_size_int locales_len; SPOOFCHECKER_METHOD_INIT_VARS; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &locales, &locales_len)) { + if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &locales, &locales_len)) { return; }