From 5d8394879b2ac6381c0a569495230940a40dd1d0 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 13 May 2005 23:08:43 +0000 Subject: [PATCH] fix bug #29975 (memory leaks when set_error_handler() is used inside error handler) --- Zend/zend.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Zend/zend.c b/Zend/zend.c index 2b5c03679d..4371a94f75 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -990,7 +990,12 @@ ZEND_API void zend_error(int type, const char *format, ...) zend_error_cb(type, error_filename, error_lineno, format, args); } - EG(user_error_handler) = orig_user_error_handler; + if (!EG(user_error_handler)) { + EG(user_error_handler) = orig_user_error_handler; + } + else { + zval_ptr_dtor(&orig_user_error_handler); + } efree(params); zval_ptr_dtor(&z_error_message); -- 2.50.1