diff options
| author | Stanislav Malyshev <stas@php.net> | 2010-12-19 05:07:31 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2010-12-19 05:07:31 +0000 |
| commit | c28cac404d2d0590ba2811f41331c60d09adbf1e (patch) | |
| tree | 80f484f8cea3e534287bd32c6f6cae5c0386a876 | |
| parent | e1dee992ee18120751b02fe4199f64ab16880718 (diff) | |
| download | php-git-c28cac404d2d0590ba2811f41331c60d09adbf1e.tar.gz | |
Fix bad args to grapheme_extract(), reported by Maksymilian Arciemowicz
| -rwxr-xr-x | ext/intl/grapheme/grapheme_string.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index ba883f34a8..6ad8769619 100755 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -799,7 +799,7 @@ PHP_FUNCTION(grapheme_extract) 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 @@ PHP_FUNCTION(grapheme_extract) } 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; |