From: Antony Dovgal <tony2001@php.net>
Date: Fri, 13 May 2005 23:08:43 +0000 (+0000)
Subject: fix bug #29975 (memory leaks when set_error_handler() is used inside error handler)
X-Git-Tag: php-5.0.1b1~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d8394879b2ac6381c0a569495230940a40dd1d0;p=php

fix bug #29975 (memory leaks when set_error_handler() is used inside error handler)
---

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);