diff options
| author | Stefan Esser <sesser@php.net> | 2004-06-06 08:37:12 +0000 |
|---|---|---|
| committer | Stefan Esser <sesser@php.net> | 2004-06-06 08:37:12 +0000 |
| commit | fb5cb59035e1534618e38314460bd8060e1419b4 (patch) | |
| tree | 7142ad232e0efa8f153e4646141a1c1ef7c7623c | |
| parent | 14deb9dd0474f203b1e12185b8263e37960d8277 (diff) | |
| download | php-git-fb5cb59035e1534618e38314460bd8060e1419b4.tar.gz | |
Fixed Zend Function Destructor to use correct TSRM handle.
| -rw-r--r-- | Zend/zend_compile.h | 3 | ||||
| -rw-r--r-- | Zend/zend_opcode.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 3d4d7e28e3..69fc099b70 100644 --- 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 e4e3901f3d..4b4f598900 100644 --- 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) { |