diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-05-13 23:08:43 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-05-13 23:08:43 +0000 |
| commit | 5d8394879b2ac6381c0a569495230940a40dd1d0 (patch) | |
| tree | ff30c1f975e5142323b2b6b9a0f61ff73c613e0c /Zend/zend.c | |
| parent | 1c7d86ad2a94ccec0a5b5bf526d0366838f33367 (diff) | |
| download | php-git-5d8394879b2ac6381c0a569495230940a40dd1d0.tar.gz | |
fix bug #29975 (memory leaks when set_error_handler() is used inside error handler)
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |