From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 11 Apr 2014 10:47:38 +0000 (+0400)
Subject: fixed persistent reaource destruction
X-Git-Tag: POST_PHPNG_MERGE~412^2~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1f3e3c371635f54cb5a43839be6dee320dbe7c9;p=php

fixed persistent reaource destruction
---

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 30d07aed37..5521964588 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);
 }