From 53db4b6087154b86f9c3d05c50a12dc3c4224dfe Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 13 May 2005 23:15:21 +0000 Subject: [PATCH] MFH: fix bug #29975 (memory leaks when set_error_handler() is used inside error handler) --- Zend/zend.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Zend/zend.c b/Zend/zend.c index 0fb5c59656..3de0a5f6d3 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1007,7 +1007,11 @@ ZEND_API void zend_error(int type, const char *format, ...) memcpy(&EG(garbage), &orig_garbage, sizeof(zval*)*orig_garbage_ptr); } - 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.40.0