From: Gustavo Lopes Date: Tue, 6 Nov 2012 12:36:40 +0000 (+0100) Subject: Destroy ancillary registry on shutdown X-Git-Tag: php-5.5.0alpha5~43^2~11^2~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fb1aa618453149bb876bda4cafd1860468c4443;p=php Destroy ancillary registry on shutdown --- diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c index 16330e0ded..88b937f828 100644 --- a/ext/sockets/sendrecvmsg.c +++ b/ext/sockets/sendrecvmsg.c @@ -1540,6 +1540,13 @@ static void init_ancillary_registry(void) to_zval_read_fd_array, SOL_SOCKET, SCM_RIGHTS); #endif +} +static void destroy_ancillary_registry(void) +{ + if (ancillary_registry.initialized) { + zend_hash_destroy(&ancillary_registry.ht); + ancillary_registry.initialized = 0; + } } static ancillary_reg_entry *get_ancillary_reg_entry(int cmsg_level, int msg_type) { @@ -1761,4 +1768,6 @@ void _socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS) #ifdef ZTS tsrm_mutex_free(ancillary_mutex); #endif + + destroy_ancillary_registry(); }