summaryrefslogtreecommitdiff
path: root/Zend/zend_exceptions.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2015-05-15 22:42:19 +0200
committerNikita Popov <nikic@php.net>2015-05-15 22:43:13 +0200
commit230b435ed40fe40931ae3f32f319cfff328ac2fe (patch)
treed40a2a6853a1f12f10c2d354c95609de00f3cf18 /Zend/zend_exceptions.c
parent2eab211379d7a7be0c9fd0d9f1207c3c8660612b (diff)
downloadphp-git-230b435ed40fe40931ae3f32f319cfff328ac2fe.tar.gz
Fix exception leak in interactive console
Shows up there because it throws at E_WARNING severity level and as such leak detection is not suppressed.
Diffstat (limited to 'Zend/zend_exceptions.c')
-rw-r--r--Zend/zend_exceptions.c3
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);
}
/* }}} */