tony2001 Fri Dec 16 14:50:32 2005 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/tests mb_strcut.phpt
Log:
MF51 Ilia's last fix
fix the test appropriately
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.230&r2=1.231&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.230
php-src/ext/mbstring/mbstring.c:1.231
--- php-src/ext/mbstring/mbstring.c:1.230 Tue Dec 6 02:07:17 2005
+++ php-src/ext/mbstring/mbstring.c Fri Dec 16 14:50:31 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.230 2005/12/06 02:07:17 sniper Exp $ */
+/* $Id: mbstring.c,v 1.231 2005/12/16 14:50:31 tony2001 Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1844,6 +1844,13 @@
}
}
+ if (from > Z_STRLEN_PP(arg1)) {
+ RETURN_FALSE;
+ }
+ if (((unsigned) from + (unsigned) len) > Z_STRLEN_PP(arg1)) {
+ len = Z_STRLEN_PP(arg1) - from;
+ }
+
ret = mbfl_strcut(&string, &result, from, len);
if (ret != NULL) {
RETVAL_STRINGL(ret->val, ret->len, 0); /* the string
is already strdup()'ed */
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/tests/mb_strcut.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strcut.phpt
diff -u php-src/ext/mbstring/tests/mb_strcut.phpt:1.3
php-src/ext/mbstring/tests/mb_strcut.phpt:1.4
--- php-src/ext/mbstring/tests/mb_strcut.phpt:1.3 Sun Nov 3 08:37:59 2002
+++ php-src/ext/mbstring/tests/mb_strcut.phpt Fri Dec 16 14:50:32 2005
@@ -17,7 +17,7 @@
print mb_strcut($euc_jp, 0, 100,'EUC-JP') . "\n";
$str = mb_strcut($euc_jp, 100, 10,'EUC-JP');
-($str === "") ? print "OK\n" : print "NG: $str\n";
+($str === false) ? print "OK\n" : print "NG: $str\n";
$str = mb_strcut($euc_jp, -100, 10,'EUC-JP');
($str !== "") ? print "OK: $str\n" : print "NG:\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
