mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-18 17:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed possible crashes in streams code

Browse Source
This commit is contained in:
Ilia Alshanetsky 2003-06-19 16:10:54 +00:00
parent ba3e315b65
commit cbfb63c1c4
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/standard/info.c
View File

@ -471,10 +471,11 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
HashTable *url_stream_wrappers_hash; HashTable *url_stream_wrappers_hash;
char *stream_protocol, *stream_protocols_buf = NULL; char *stream_protocol, *stream_protocols_buf = NULL;
int stream_protocol_len, stream_protocols_buf_len = 0; int stream_protocol_len, stream_protocols_buf_len = 0;
ulong num_key;
if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) { if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) {
for (zend_hash_internal_pointer_reset(url_stream_wrappers_hash); for (zend_hash_internal_pointer_reset(url_stream_wrappers_hash);
zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol, &stream_protocol_len, NULL, 0, NULL) == HASH_KEY_IS_STRING; zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol, &stream_protocol_len, &num_key, 0, NULL) == HASH_KEY_IS_STRING;
zend_hash_move_forward(url_stream_wrappers_hash)) { zend_hash_move_forward(url_stream_wrappers_hash)) {
stream_protocols_buf = erealloc(stream_protocols_buf, stream_protocols_buf_len + stream_protocol_len + 2 + 1); stream_protocols_buf = erealloc(stream_protocols_buf, stream_protocols_buf_len + stream_protocol_len + 2 + 1);
memcpy(stream_protocols_buf + stream_protocols_buf_len, stream_protocol, stream_protocol_len); memcpy(stream_protocols_buf + stream_protocols_buf_len, stream_protocol, stream_protocol_len);

11
ext/standard/streamsfuncs.c
View File

@ -353,6 +353,7 @@ PHP_FUNCTION(stream_get_transports)
HashTable *stream_xport_hash; HashTable *stream_xport_hash;
char *stream_xport; char *stream_xport;
int stream_xport_len; int stream_xport_len;
ulong num_key;
if (ZEND_NUM_ARGS() != 0) { if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -363,7 +364,7 @@ PHP_FUNCTION(stream_get_transports)
zend_hash_internal_pointer_reset(stream_xport_hash); zend_hash_internal_pointer_reset(stream_xport_hash);
while (zend_hash_get_current_key_ex(stream_xport_hash, while (zend_hash_get_current_key_ex(stream_xport_hash,
&stream_xport, &stream_xport_len, &stream_xport, &stream_xport_len,
NULL, 0, NULL) == HASH_KEY_IS_STRING) { &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);
zend_hash_move_forward(stream_xport_hash); zend_hash_move_forward(stream_xport_hash);
} }
@ -380,6 +381,7 @@ PHP_FUNCTION(stream_get_wrappers)
HashTable *url_stream_wrappers_hash; HashTable *url_stream_wrappers_hash;
char *stream_protocol; char *stream_protocol;
int key_flags, stream_protocol_len = 0; int key_flags, stream_protocol_len = 0;
ulong num_key;
if (ZEND_NUM_ARGS() != 0) { if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -388,7 +390,7 @@ PHP_FUNCTION(stream_get_wrappers)
if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) { if ((url_stream_wrappers_hash = php_stream_get_url_stream_wrappers_hash())) {
array_init(return_value); array_init(return_value);
for(zend_hash_internal_pointer_reset(url_stream_wrappers_hash); for(zend_hash_internal_pointer_reset(url_stream_wrappers_hash);
(key_flags = zend_hash_get_current_key_ex(url_stream_wrappers_hash, &stream_protocol, &stream_protocol_len, NULL, 0, NULL)) != HASH_KEY_NON_EXISTANT; (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)) { zend_hash_move_forward(url_stream_wrappers_hash)) {
if (key_flags == HASH_KEY_IS_STRING) { 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);
@ -640,16 +642,17 @@ static int parse_context_options(php_stream_context *context, zval *options)
char *wkey, *okey; char *wkey, *okey;
int wkey_len, okey_len; int wkey_len, okey_len;
int ret = SUCCESS; int ret = SUCCESS;
ulong num_key;
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(options), &pos); zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(options), &pos);
while (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(options), (void**)&wval, &pos)) { while (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(options), (void**)&wval, &pos)) {
if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_P(options), &wkey, &wkey_len, NULL, 0, &pos) if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_P(options), &wkey, &wkey_len, &num_key, 0, &pos)
&& Z_TYPE_PP(wval) == IS_ARRAY) { && Z_TYPE_PP(wval) == IS_ARRAY) {
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(wval), &opos); zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(wval), &opos);
while (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(wval), (void**)&oval, &opos)) { while (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(wval), (void**)&oval, &opos)) {
if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(wval), &okey, &okey_len, NULL, 0, &opos)) { if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_PP(wval), &okey, &okey_len, &num_key, 0, &opos)) {
php_stream_context_set_option(context, wkey, okey, *oval); php_stream_context_set_option(context, wkey, okey, *oval);
} }
zend_hash_move_forward_ex(Z_ARRVAL_PP(wval), &opos); zend_hash_move_forward_ex(Z_ARRVAL_PP(wval), &opos);

3
ext/standard/user_filters.c
View File

@ -427,6 +427,7 @@ PHP_FUNCTION(stream_get_filters)
char *filter_name; char *filter_name;
int key_flags, filter_name_len = 0; int key_flags, filter_name_len = 0;
HashTable *filters_hash; HashTable *filters_hash;
ulong num_key;
if (ZEND_NUM_ARGS() != 0) { if (ZEND_NUM_ARGS() != 0) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
@ -438,7 +439,7 @@ PHP_FUNCTION(stream_get_filters)
if (filters_hash) { if (filters_hash) {
for(zend_hash_internal_pointer_reset(filters_hash); for(zend_hash_internal_pointer_reset(filters_hash);
(key_flags = zend_hash_get_current_key_ex(filters_hash, &filter_name, &filter_name_len, NULL, 0, NULL)) != HASH_KEY_NON_EXISTANT; (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)) zend_hash_move_forward(filters_hash))
if (key_flags == HASH_KEY_IS_STRING) if (key_flags == HASH_KEY_IS_STRING)
add_next_index_stringl(return_value, filter_name, filter_name_len, 1); add_next_index_stringl(return_value, filter_name, filter_name_len, 1);