diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-05-15 22:45:35 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-05-15 22:45:35 +0200 |
| commit | 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (patch) | |
| tree | f9c20aa7c8a55c9670ee4d456e895679c80fb45e /Zend | |
| parent | 6868b56e25e6ce80418219bd876ee2de7646cf63 (diff) | |
| parent | 230b435ed40fe40931ae3f32f319cfff328ac2fe (diff) | |
| download | php-git-34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_exceptions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index c6bef24346..cb8b79ece9 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -922,7 +922,6 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ zend_string_release(file); zend_string_release(message); - OBJ_RELEASE(ex); } else if (instanceof_function(ce_exception, base_exception_ce)) { zval tmp, rv; zend_string *str, *file = NULL; @@ -969,6 +968,8 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ } else { zend_error(severity, "Uncaught exception '%s'", ce_exception->name->val); } + + OBJ_RELEASE(ex); } /* }}} */ |