Copy params to fci

Author: trowski

Zend/tests/bug41026.phpt

@@ -12,7 +12,7 @@ class try_class
 
     static public function on_shutdown ()
     {
-        printf ("CHECKPOINT\n");
+        printf ("CHECKPOINT\n"); /* never reached */
     }
 }
 
@@ -22,4 +22,5 @@ echo "Done\n";
 ?>
 --EXPECT--
 Done
-CHECKPOINT
+
+Fatal error: Registered shutdown function self::on_shutdown() cannot be called, function does not exist in Unknown on line 0

ext/standard/basic_functions.c

@@ -1671,6 +1671,7 @@ void user_shutdown_function_dtor(zval *zv) /* {{{ */
 		zval_ptr_dtor(&shutdown_function_entry->fci.params[i]);
 	}
 
+	efree(shutdown_function_entry->fci.params);
 	efree(shutdown_function_entry);
 }
 /* }}} */
@@ -1762,8 +1763,7 @@ PHPAPI void php_call_shutdown_functions(void) /* {{{ */
 	if (BG(user_shutdown_function_names)) {
 		zend_try {
 			zend_hash_apply(BG(user_shutdown_function_names), user_shutdown_function_call);
-		}
-		zend_end_try();
+		} zend_end_try();
 	}
 }
 /* }}} */
@@ -1786,24 +1786,22 @@ PHPAPI void php_free_shutdown_functions(void) /* {{{ */
 /* {{{ Register a user-level function to be called on request termination */
 PHP_FUNCTION(register_shutdown_function)
 {
-	php_shutdown_function_entry *entry = emalloc(sizeof(php_shutdown_function_entry));
-	bool status = false;
+	php_shutdown_function_entry entry;
+	zval *params;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "f*", &entry->fci, &entry->fci_cache,
-			&entry->fci.params, &entry->fci.param_count) == FAILURE) {
-		efree(entry);
-		RETURN_THROWS();
-	}
+	ZEND_PARSE_PARAMETERS_START(1, -1)
+		Z_PARAM_FUNC(entry.fci, entry.fci_cache)
+		Z_PARAM_VARIADIC('+', params, entry.fci.param_count);
+	ZEND_PARSE_PARAMETERS_END();
 
-	Z_TRY_ADDREF(entry->fci.function_name);
-	for (size_t i = 0; i < entry->fci.param_count; i++) {
-		Z_TRY_ADDREF(entry->fci.params[i]);
-	}
+	entry.fci.params = emalloc(sizeof(zval) * entry.fci.param_count);
 
-	status = append_user_shutdown_function(entry);
-	ZEND_ASSERT(status);
+	Z_TRY_ADDREF(entry.fci.function_name);
+	for (size_t i = 0; i < entry.fci.param_count; i++) {
+		ZVAL_COPY(&entry.fci.params[i], &params[i]);
+	}
 
-	efree(entry);
+	ZEND_ASSERT(append_user_shutdown_function(&entry));
 }
 /* }}} */