cvs: php-src /ext/intl/grapheme grapheme_string.c
| From: | Stanislav Malyshev | Date: | Fri, 10 Apr 2009 16:55:51 +0000 |
| Subject: | cvs: php-src /ext/intl/grapheme grapheme_string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56988@lists.php.net to get a copy of this message | ||
stas Fri Apr 10 16:55:51 2009 UTC
Modified files:
/php-src/ext/intl/grapheme grapheme_string.c
Log:
isync with 5 branch
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/grapheme/grapheme_string.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/intl/grapheme/grapheme_string.c
diff -u php-src/ext/intl/grapheme/grapheme_string.c:1.4
php-src/ext/intl/grapheme/grapheme_string.c:1.5
--- php-src/ext/intl/grapheme/grapheme_string.c:1.4 Tue Mar 10 23:39:26 2009
+++ php-src/ext/intl/grapheme/grapheme_string.c Fri Apr 10 16:55:51 2009
@@ -542,7 +542,7 @@
length += iter_val;
}
- if ( UBRK_DONE == sub_str_end_pos ) {
+ if ( UBRK_DONE == sub_str_end_pos && length < 0) {
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_substr: length not contained in
string", 1 TSRMLS_CC );