cvs: php-src(PHP_5_2) /ext/mbstring mbstring.c
| From: | Rui Hirokawa | Date: | Sun, 17 Feb 2008 01:59:03 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/mbstring mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-48606@lists.php.net to get a copy of this message | ||
hirokawa Sun Feb 17 01:59:03 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
MF PHP5_3 (fixed #43840)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.28&r2=1.224.2.22.2.29&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.28
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.29
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.28 Sat Feb 16 08:25:11 2008
+++ php-src/ext/mbstring/mbstring.c Sun Feb 17 01:59:03 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.28 2008/02/16 08:25:11 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.29 2008/02/17 01:59:03 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -1613,7 +1613,7 @@
}
}
- if (offset < 0 || (unsigned long)offset > haystack.len) {
+ if (offset < 0 || (unsigned long)offset > (unsigned long)mbfl_strlen(&haystack)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
RETURN_FALSE;
}