cvs: php-src /ext/standard string.c
| From: | Antony Dovgal | Date: | Tue, 08 Aug 2006 08:59:52 +0000 |
| Subject: | cvs: php-src /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39827@lists.php.net to get a copy of this message | ||
tony2001 Tue Aug 8 08:59:52 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
fix typo and invalid read
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.564&r2=1.565&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.564 php-src/ext/standard/string.c:1.565
--- php-src/ext/standard/string.c:1.564 Fri Aug 4 23:20:04 2006
+++ php-src/ext/standard/string.c Tue Aug 8 08:59:51 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.564 2006/08/04 23:20:04 andrei Exp $ */
+/* $Id: string.c,v 1.565 2006/08/08 08:59:51 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2688,7 +2688,7 @@
u_needle_char[needle_len++] = U16_TRAIL(ch);
u_needle_char[needle_len] = 0;
}
- haystack_dup = php_u_strtolower(haystack_dup, &haystack_len, UG(default_locale));
+ haystack_dup = php_u_strtolower(Z_USTRVAL_P(haystack), &haystack_len, UG(default_locale));
found = zend_u_memnstr((UChar *)haystack_dup + offset,
(UChar *)u_needle_char, needle_len,
(UChar *)haystack_dup + haystack_len);