Fixed Zend Function Destructor to use correct TSRM handle.

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 3d4d7e28e315b33e0977dd7f2084997be0b2a6ef..69fc099b708ec78e3d95dc575e67933e417557f7 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -494,13 +494,14 @@ ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC);
 ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC);
 
 ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
+ZEND_API void zend_function_dtor(zend_function *function);
 ZEND_API void destroy_zend_class(zend_class_entry **pce);
 void zend_class_add_ref(zend_class_entry **ce);
 
 ZEND_API void zend_mangle_property_name(char **dest, int *dest_length, char *src1, int src1_length, char *src2, int src2_length, int internal);
 ZEND_API void zend_unmangle_property_name(char *mangled_property, char **prop_name, char **class_name);
 
-#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function
+#define ZEND_FUNCTION_DTOR (void (*)(void *)) zend_function_dtor
 #define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class
 
 zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC);

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index e4e3901f3d44542835a92a9465a9f2ba33bc07fd..4b4f5989003fa0da69c5995f00bce345e2cf7663 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -108,6 +108,13 @@ ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC)
        }
 }
 
+ZEND_API void zend_function_dtor(zend_function *function)
+{
+       TSRMLS_FETCH();
+
+       destroy_zend_function(function TSRMLS_CC);
+}
+
 static void zend_cleanup_op_array_data(zend_op_array *op_array)
 {
        if (op_array->static_variables) {