Fix leak of callable error if exception also thrown

Author: nikic

Zend/tests/callable_param_exception_leak.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Make sure is_callable error does not leak if an exception is also thrown
+--FILE--
+<?php
+spl_autoload_register(function ($class) {
+    throw new Exception("Failed");
+});
+try {
+    array_map('A::b', []);
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Failed

Zend/zend_API.c

@@ -333,22 +333,18 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_string_or_nu
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(uint32_t num, char *error) /* {{{ */
 {
-	if (EG(exception)) {
-		return;
+	if (!EG(exception)) {
+		zend_argument_type_error(num, "must be a valid callback, %s", error);
 	}
-
-	zend_argument_type_error(num, "must be a valid callback, %s", error);
 	efree(error);
 }
 /* }}} */
 
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_or_null_error(uint32_t num, char *error) /* {{{ */
 {
-	if (EG(exception)) {
-		return;
+	if (!EG(exception)) {
+		zend_argument_type_error(num, "must be a valid callback or null, %s", error);
 	}
-
-	zend_argument_type_error(num, "must be a valid callback or null, %s", error);
 	efree(error);
 }
 /* }}} */