From: Nikita Popov <nikic@php.net>
Date: Fri, 15 May 2015 20:42:19 +0000 (+0200)
Subject: Fix exception leak in interactive console
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~65^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=230b435ed40fe40931ae3f32f319cfff328ac2fe;p=php

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.
---

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);
 }
 /* }}} */