cvs: php-src /ext/standard string.c
| From: | Felipe Pena | Date: | Sat, 17 Jan 2009 20:36:23 +0000 |
| Subject: | cvs: php-src /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55704@lists.php.net to get a copy of this message | ||
felipe Sat Jan 17 20:36:23 2009 UTC
Modified files:
/php-src/ext/standard string.c
Log:
- Fixed bug #47102 (strripos issues unexpected warning with UNICODE haystack) (Noticed by Andy
Wharmby)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.690&r2=1.691&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.690 php-src/ext/standard/string.c:1.691
--- php-src/ext/standard/string.c:1.690 Fri Jan 9 18:23:45 2009
+++ php-src/ext/standard/string.c Sat Jan 17 20:36:22 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.690 2009/01/09 18:23:45 tony2001 Exp $ */
+/* $Id: string.c,v 1.691 2009/01/17 20:36:22 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2913,7 +2913,7 @@
if (haystack_type == IS_UNICODE) {
if (offset >= 0) {
U16_FWD_N(haystack.u, cu_offset, haystack_len, offset);
- if (cu_offset > haystack_len - needle_len) {
+ if (cu_offset > haystack_len) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack
string");
RETURN_FALSE;
}