archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fix leaks with registered shutdown functions.

Browse source
This commit is contained in:
foobar 2005-01-09 16:30:09 +00:00
parent 2da8b014af
commit 6ffb0dcaf2
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/standard/basic_functions.c
View file

@ -2282,14 +2282,21 @@ static int user_tick_function_compare(user_tick_function_entry * tick_fe1, user_
} }
} }
void php_call_shutdown_functions(void) void php_call_shutdown_functions(TSRMLS_D)
{ {
TSRMLS_FETCH();
if (BG(user_shutdown_function_names)) if (BG(user_shutdown_function_names))
zend_try { zend_try {
zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) user_shutdown_function_call TSRMLS_CC); zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t) user_shutdown_function_call TSRMLS_CC);
memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf));
php_free_shutdown_functions(TSRMLS_C);
}
zend_end_try();
}
void php_free_shutdown_functions(TSRMLS_D)
{
if (BG(user_shutdown_function_names))
zend_try {
zend_hash_destroy(BG(user_shutdown_function_names)); zend_hash_destroy(BG(user_shutdown_function_names));
FREE_HASHTABLE(BG(user_shutdown_function_names)); FREE_HASHTABLE(BG(user_shutdown_function_names));
BG(user_shutdown_function_names) = NULL; BG(user_shutdown_function_names) = NULL;

6
main/main.c
View file

@ -1131,11 +1131,12 @@ void php_request_shutdown_for_hook(void *dummy)
{ {
TSRMLS_FETCH(); TSRMLS_FETCH();
if (PG(modules_activated)) zend_try { if (PG(modules_activated)) zend_try {
php_call_shutdown_functions(); php_call_shutdown_functions(TSRMLS_C);
} zend_end_try(); } zend_end_try();
if (PG(modules_activated)) { if (PG(modules_activated)) {
zend_deactivate_modules(TSRMLS_C); zend_deactivate_modules(TSRMLS_C);
php_free_shutdown_functions(TSRMLS_C);
} }
zend_try { zend_try {
@ -1191,11 +1192,12 @@ void php_request_shutdown(void *dummy)
} zend_end_try(); } zend_end_try();
if (PG(modules_activated)) zend_try { if (PG(modules_activated)) zend_try {
php_call_shutdown_functions(); php_call_shutdown_functions(TSRMLS_C);
} zend_end_try(); } zend_end_try();
if (PG(modules_activated)) { if (PG(modules_activated)) {
zend_deactivate_modules(TSRMLS_C); zend_deactivate_modules(TSRMLS_C);
php_free_shutdown_functions(TSRMLS_C);
} }
zend_try { zend_try {

3
main/php_main.h
View file

@ -48,7 +48,8 @@ PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC);
PHPAPI void php_html_puts(const char *str, uint siz TSRMLS_DC); PHPAPI void php_html_puts(const char *str, uint siz TSRMLS_DC);
extern void php_call_shutdown_functions(void); extern void php_call_shutdown_functions(TSRMLS_D);
extern void php_free_shutdown_functions(TSRMLS_D);
/* environment module */ /* environment module */
extern int php_init_environ(void); extern int php_init_environ(void);