mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-26 03:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

I've altered my diagnosis of segfault/leak problem

Browse Source
This commit is contained in:
Wez Furlong 2002-03-13 02:49:03 +00:00
parent 3ef239bfc8
commit 07f5120ee3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/standard/aggregation.c
View File

@ -28,16 +28,19 @@
static void aggregation_info_dtor(aggregation_info *info)
{
/* FIXME: This is here to make it compile with Engine 2 but part of this module will need rewriting */
#ifndef ZEND_ENGINE_2
destroy_zend_class(info->new_ce);
efree(info->new_ce);
#else
/* FIXME: In ZE2, this dtor is called prior to deleting the objects,
* which causes this new_ce to be destroyed twice (which is bad news).
* Skipping deleting it here will prevent a segfault but will leak
* the class name, the static_members hash and the ce itself */
/* FIXME: In ZE2, there seems to be an issue with refcounts or something between
* this class entry and the original; there are problems when destroying the
* function table.
* Skipping deleting here will prevent a segfault but will leak
* the class name, the static_members hash and the ce itself.
* */
/* destroy_zend_class(&info->new_ce); */
/* destroy_zend_class(&info->new_ce); */
#endif
zval_ptr_dtor(&info->aggr_members);
@ -131,6 +134,7 @@ static void aggregate_methods(zend_class_entry *ce, zend_class_entry *from_ce, i
*/
if (zend_hash_add(&ce->function_table, func_name, func_name_len,
(void*)function, sizeof(zend_function), NULL) == SUCCESS) {
add_next_index_stringl(aggr_methods, func_name, func_name_len-1, 1);
}