Use zend_fcall_info_argp

Author: trowski

ext/standard/basic_functions.c

@@ -1667,11 +1667,7 @@ void user_shutdown_function_dtor(zval *zv) /* {{{ */
 	php_shutdown_function_entry *shutdown_function_entry = Z_PTR_P(zv);
 
 	zval_ptr_dtor(&shutdown_function_entry->fci.function_name);
-	for (size_t i = 0; i < shutdown_function_entry->fci.param_count; i++) {
-		zval_ptr_dtor(&shutdown_function_entry->fci.params[i]);
-	}
-
-	efree(shutdown_function_entry->fci.params);
+	zend_fcall_info_args_clear(&shutdown_function_entry->fci, true);
 	efree(shutdown_function_entry);
 }
 /* }}} */
@@ -1788,25 +1784,20 @@ PHP_FUNCTION(register_shutdown_function)
 {
 	php_shutdown_function_entry entry;
 	zval *params;
+	uint32_t param_count;
+	bool status;
 
 	ZEND_PARSE_PARAMETERS_START(1, -1)
 		Z_PARAM_FUNC(entry.fci, entry.fci_cache)
-		Z_PARAM_VARIADIC('+', params, entry.fci.param_count);
+		Z_PARAM_VARIADIC('+', params, param_count);
 	ZEND_PARSE_PARAMETERS_END();
 
 	Z_TRY_ADDREF(entry.fci.function_name);
+	entry.fci.params = NULL;
+	zend_fcall_info_argp(&entry.fci, param_count, params);
 
-	if (entry.fci.param_count) {
-		entry.fci.params = emalloc(sizeof(zval) * entry.fci.param_count);
-
-		for (size_t i = 0; i < entry.fci.param_count; i++) {
-			ZVAL_COPY(&entry.fci.params[i], &params[i]);
-		}
-	} else {
-		entry.fci.params = NULL;
-	}
-
-	ZEND_ASSERT(append_user_shutdown_function(&entry));
+	status = append_user_shutdown_function(&entry);
+	ZEND_ASSERT(status);
 }
 /* }}} */