Merge branch 'PHP-7.4'

dstogov · dstogov · commit d2f196f6f70a · 2019-02-04T13:58:24.000+03:00
* PHP-7.4:
  Reset common fields of EG(trampoline)
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -1208,6 +1208,11 @@ ZEND_API zend_function *zend_get_call_trampoline_func(zend_class_entry *ce, zend
 		func->function_name = zend_string_copy(method_name);
 	}
 
+	func->prototype = NULL;
+	func->num_args = 0;
+	func->required_num_args = 0;
+	func->arg_info = 0;
+
 	return (zend_function*)func;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1208,6 +1208,11 @@ ZEND_API zend_function zend_get_call_trampoline_func(zend_class_entry ce, zend`
`1208`	`1208`	`func->function_name = zend_string_copy(method_name);`
`1209`	`1209`	`}`
`1210`	`1210`
	`1211`	`+ func->prototype = NULL;`
	`1212`	`+ func->num_args = 0;`
	`1213`	`+ func->required_num_args = 0;`
	`1214`	`+ func->arg_info = 0;`
	`1215`	`+`
`1211`	`1216`	`return (zend_function*)func;`
`1212`	`1217`	`}`
`1213`	`1218`	`/* }}} */`