tony2001 Fri Jan 19 14:49:52 2007 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c user_filters.c
Log:
fix #40168
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.100
php-src/ext/standard/streamsfuncs.c:1.101
--- php-src/ext/standard/streamsfuncs.c:1.100 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/streamsfuncs.c Fri Jan 19 14:49:52 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.100 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: streamsfuncs.c,v 1.101 2007/01/19 14:49:52 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -576,7 +576,7 @@
while (zend_hash_get_current_key_ex(stream_xport_hash,
&stream_xport, &stream_xport_len,
&num_key, 0, NULL) ==
HASH_KEY_IS_STRING) {
- add_next_index_rt_stringl(return_value, stream_xport.s,
stream_xport_len, ZSTR_DUPLICATE);
+ add_next_index_rt_stringl(return_value, stream_xport.s,
stream_xport_len - 1, ZSTR_DUPLICATE);
zend_hash_move_forward(stream_xport_hash);
}
} else {
@@ -604,7 +604,7 @@
(key_flags =
zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol,
&stream_protocol_len, &num_key, 0, NULL)) != HASH_KEY_NON_EXISTANT;
zend_hash_move_forward(url_stream_wrappers_hash)) {
if (key_flags == HASH_KEY_IS_STRING) {
- add_next_index_rt_stringl(return_value,
stream_protocol.s, stream_protocol_len, ZSTR_DUPLICATE);
+ add_next_index_rt_stringl(return_value,
stream_protocol.s, stream_protocol_len - 1, ZSTR_DUPLICATE);
}
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/user_filters.c?r1=1.43&r2=1.44&diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.43
php-src/ext/standard/user_filters.c:1.44
--- php-src/ext/standard/user_filters.c:1.43 Mon Jan 15 17:06:52 2007
+++ php-src/ext/standard/user_filters.c Fri Jan 19 14:49:52 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_filters.c,v 1.43 2007/01/15 17:06:52 tony2001 Exp $ */
+/* $Id: user_filters.c,v 1.44 2007/01/19 14:49:52 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -572,7 +572,7 @@
(key_flags = zend_hash_get_current_key_ex(filters_hash,
&filter_name, &filter_name_len, &num_key, 0, &pos)) != HASH_KEY_NON_EXISTANT;
zend_hash_move_forward_ex(filters_hash, &pos)) {
if (key_flags == HASH_KEY_IS_STRING) {
- add_next_index_rt_stringl(return_value,
filter_name.s, filter_name_len, 1);
+ add_next_index_rt_stringl(return_value,
filter_name.s, filter_name_len - 1, ZSTR_DUPLICATE);
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
