helly Mon Jul 17 21:12:23 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_iterators.c
Log:
- Fix key handling
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.31&r2=1.73.2.32&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.31
php-src/ext/spl/spl_iterators.c:1.73.2.32
--- php-src/ext/spl/spl_iterators.c:1.73.2.31 Fri May 12 09:43:07 2006
+++ php-src/ext/spl/spl_iterators.c Mon Jul 17 21:12:23 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.31 2006/05/12 09:43:07 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.32 2006/07/17 21:12:23 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1641,7 +1641,7 @@
}
if (intern->u.caching.flags & CIT_TOSTRING_USE_KEY) {
if (intern->current.key_type == HASH_KEY_IS_STRING) {
- RETURN_STRINGL(intern->current.str_key,
intern->current.str_key_len, 1);
+ RETURN_STRINGL(intern->current.str_key,
intern->current.str_key_len-1, 1);
} else {
RETVAL_LONG(intern->current.int_key);
convert_to_string(return_value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
