com php-src: fixed persistent reaource destruction: Zend/zend_list.c

Commit: f1f3e3c371635f54cb5a43839be6dee320dbe7c9 Author: Dmitry Stogov <dmitry@zend.com> Fri, 11 Apr 2014 14:47:38 +0400 Parents: aa2ed70d43d28f008c7cdd0a9128183b725eb51f Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1f3e3c371635f54cb5a43839be6dee320dbe7c9 Log: fixed persistent reaource destruction Changed paths: M Zend/zend_list.c Diff: diff --git a/Zend/zend_list.c b/Zend/zend_list.c index 30d07ae..5521964 100644 --- a/Zend/zend_list.c +++ b/Zend/zend_list.c @@ -174,11 +174,29 @@ void list_entry_destructor(zval *zv) void plist_entry_destructor(zval *zv) { zend_resource *res = Z_RES_P(zv); - zend_rsrc_list_dtors_entry *ld; - TSRMLS_FETCH(); if (res->type >= 0) { - zend_resource_dtor(res TSRMLS_CC); + zend_rsrc_list_dtors_entry *ld; + TSRMLS_FETCH(); + + ld = zend_hash_index_find_ptr(&list_destructors, res->type); + if (ld) { + switch (ld->type) { + case ZEND_RESOURCE_LIST_TYPE_STD: + if (ld->plist_dtor) { + (ld->plist_dtor)(res->ptr); + } + break; + case ZEND_RESOURCE_LIST_TYPE_EX: + if (ld->plist_dtor_ex) { + ld->plist_dtor_ex(res TSRMLS_CC); + } + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + } else { + zend_error(E_WARNING,"Unknown list entry type (%d)", res->type); + } } free(res); }