archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed stream handler override

Browse source
This commit is contained in:
Dmitry Stogov 2017-12-14 23:55:57 +03:00
parent 0d484172fe
commit a7b6812ae6
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sapi/phpdbg/phpdbg.c
View file

@ -1356,7 +1356,7 @@ php_stream *phpdbg_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *
return stream;
}
return PHPDBG_G(orig_url_wrap_php)->stream_opener(wrapper, path, mode, options, opened_path, context STREAMS_CC);
return PHPDBG_G(orig_url_wrap_php)->wops->stream_opener(wrapper, path, mode, options, opened_path, context STREAMS_CC);
} /* }}} */
int main(int argc, char **argv) /* {{{ */
@ -1399,6 +1399,7 @@ int main(int argc, char **argv) /* {{{ */
void* (*_malloc)(size_t);
void (*_free)(void*);
void* (*_realloc)(void*, size_t);
php_stream_wrapper wrapper;
php_stream_wrapper_ops wops;
@ -1868,11 +1869,14 @@ phpdbg_main:
}
{
php_stream_wrapper *wrapper = zend_hash_str_find_ptr(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
PHPDBG_G(orig_url_wrap_php) = wrapper->wops;
memcpy(&wops, wrapper->wops, sizeof(wops));
zval *zv = zend_hash_str_find(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
php_stream_wrapper *tmp_wrapper = Z_PTR_P(zv);
PHPDBG_G(orig_url_wrap_php) = tmp_wrapper;
memcpy(&wrapper, tmp_wrapper, sizeof(wrapper));
memcpy(&wops, tmp_wrapper->wops, sizeof(wops));
wops.stream_opener = phpdbg_stream_url_wrap_php;
wrapper->wops = &wops;
wrapper.wops = (const php_stream_wrapper_ops*)&wops;
Z_PTR_P(zv) = &wrapper;
}
/* Make stdin, stdout and stderr accessible from PHP scripts */
@ -2151,8 +2155,8 @@ phpdbg_out:
}
{
php_stream_wrapper *wrapper = zend_hash_str_find_ptr(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
wrapper->wops = PHPDBG_G(orig_url_wrap_php);
zval *zv = zend_hash_str_find(php_stream_get_url_stream_wrappers_hash(), ZEND_STRL("php"));
Z_PTR_P(zv) = (void*)PHPDBG_G(orig_url_wrap_php);
}
zend_hash_destroy(&PHPDBG_G(file_sources));

2
sapi/phpdbg/phpdbg.h
View file

@ -308,7 +308,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg)
zend_bool last_was_newline; /* check if we don't need to output a newline upon next phpdbg_error or phpdbg_notice */
FILE *stdin_file; /* FILE pointer to stdin source file */
const php_stream_wrapper_ops *orig_url_wrap_php;
const php_stream_wrapper *orig_url_wrap_php;
char input_buffer[PHPDBG_MAX_CMD]; /* stdin input buffer */
int input_buflen; /* length of stdin input buffer */