Fix leak if throw_exception_object() fails

nikic · nikic · commit 5063b5aea16a · 2016-07-14T18:37:21.000+02:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -1070,6 +1070,7 @@ ZEND_API ZEND_COLD void zend_throw_exception_object(zval *exception) /* {{{ */
 
 	if (!exception_ce || !instanceof_function(exception_ce, zend_ce_throwable)) {
 		zend_throw_error(NULL, "Cannot throw objects that do not implement Throwable");
+		zval_ptr_dtor(exception);
 		return;
 	}
 	zend_throw_exception_internal(exception);

Original file line number	Diff line number	Diff line change
`@@ -1070,6 +1070,7 @@ ZEND_API ZEND_COLD void zend_throw_exception_object(zval exception) / {{{ */`
`1070`	`1070`
`1071`	`1071`	`if (!exception_ce \|\| !instanceof_function(exception_ce, zend_ce_throwable)) {`
`1072`	`1072`	`zend_throw_error(NULL, "Cannot throw objects that do not implement Throwable");`
	`1073`	`+ zval_ptr_dtor(exception);`
`1073`	`1074`	`return;`
`1074`	`1075`	`}`
`1075`	`1076`	`zend_throw_exception_internal(exception);`