stas Sun, 19 Dec 2010 05:07:31 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=306449
Log: Fix bad args to grapheme_extract(), reported by Maksymilian Arciemowicz Changed paths: U php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c U php/php-src/trunk/ext/intl/grapheme/grapheme_string.c Modified: php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c 2010-12-19 04:10:49 UTC (rev 306448) +++ php/php-src/branches/PHP_5_3/ext/intl/grapheme/grapheme_string.c 2010-12-19 05:07:31 UTC (rev 306449) @@ -799,7 +799,7 @@ if ( NULL != next ) { if ( !PZVAL_IS_REF(next) ) { - intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, + intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: 'next' was not passed by reference", 0 TSRMLS_CC ); RETURN_FALSE; @@ -819,11 +819,17 @@ } if ( lstart > INT32_MAX || lstart < 0 || lstart >= str_len ) { + intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: start not contained in string", 0 TSRMLS_CC ); + RETURN_FALSE; + } - intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: start not contained in string", 1 TSRMLS_CC ); - + if ( size > INT32_MAX || size < 0) { + intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: size is invalid", 0 TSRMLS_CC ); RETURN_FALSE; } + if (size == 0) { + RETURN_EMPTY_STRING(); + } /* we checked that it will fit: */ start = (int32_t) lstart; Modified: php/php-src/trunk/ext/intl/grapheme/grapheme_string.c =================================================================== --- php/php-src/trunk/ext/intl/grapheme/grapheme_string.c 2010-12-19 04:10:49 UTC (rev 306448) +++ php/php-src/trunk/ext/intl/grapheme/grapheme_string.c 2010-12-19 05:07:31 UTC (rev 306449) @@ -799,7 +799,7 @@ if ( NULL != next ) { if ( !PZVAL_IS_REF(next) ) { - intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, + intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: 'next' was not passed by reference", 0 TSRMLS_CC ); RETURN_FALSE; @@ -819,11 +819,17 @@ } if ( lstart > INT32_MAX || lstart < 0 || lstart >= str_len ) { + intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: start not contained in string", 0 TSRMLS_CC ); + RETURN_FALSE; + } - intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: start not contained in string", 1 TSRMLS_CC ); - + if ( size > INT32_MAX || size < 0) { + intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_extract: size is invalid", 0 TSRMLS_CC ); RETURN_FALSE; } + if (size == 0) { + RETURN_EMPTY_STRING(); + } /* we checked that it will fit: */ start = (int32_t) lstart;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php