]> granicus.if.org Git - php/commitdiff
MFH: fix #40168
authorAntony Dovgal <tony2001@php.net>
Fri, 19 Jan 2007 14:50:11 +0000 (14:50 +0000)
committerAntony Dovgal <tony2001@php.net>
Fri, 19 Jan 2007 14:50:11 +0000 (14:50 +0000)
ext/standard/streamsfuncs.c
ext/standard/user_filters.c

index d122a4b89ba4aea6fce64cfd6a604453d3f5204e..e296d9aaea48e81e68abcc6da3a61c90cf0079df 100644 (file)
@@ -530,7 +530,7 @@ PHP_FUNCTION(stream_get_transports)
                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_stringl(return_value, stream_xport, stream_xport_len, 1);
+                       add_next_index_stringl(return_value, stream_xport, stream_xport_len - 1, 1);
                        zend_hash_move_forward(stream_xport_hash);
                }
        } else {
@@ -558,7 +558,7 @@ PHP_FUNCTION(stream_get_wrappers)
                        (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_stringl(return_value, stream_protocol, stream_protocol_len, 1);
+                                       add_next_index_stringl(return_value, stream_protocol, stream_protocol_len - 1, 1);
                                }
                }
        } else {
index f10a441ea6ab57495e2e9a4b6d0024b202025e7f..31d623a364d8ee46edf4d7bdbd37fb661ede49a4 100644 (file)
@@ -527,8 +527,9 @@ PHP_FUNCTION(stream_get_filters)
                for(zend_hash_internal_pointer_reset(filters_hash);
                        (key_flags = zend_hash_get_current_key_ex(filters_hash, &filter_name, &filter_name_len, &num_key, 0, NULL)) != HASH_KEY_NON_EXISTANT;
                        zend_hash_move_forward(filters_hash))
-                               if (key_flags == HASH_KEY_IS_STRING)
-                                       add_next_index_stringl(return_value, filter_name, filter_name_len, 1);
+                               if (key_flags == HASH_KEY_IS_STRING) {
+                                       add_next_index_stringl(return_value, filter_name, filter_name_len - 1, 1);
+                               }
        }
        /* It's okay to return an empty array if no filters are registered */
 }