Merge branch 'PHP-8.4' into PHP-8.5

TimWolla · TimWolla · commit 46940a0444b4 · 2026-04-12T18:43:32.000+02:00
* PHP-8.4: Fix GH-21730: Mt19937::__debugInfo() leaks state HashTable when the serialize callback fails (#21733)
diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
@@ -392,11 +392,11 @@ PHP_METHOD(Random_Engine_Mt19937, __debugInfo)
 
 	if (engine->engine.algo->serialize) {
 		array_init(&t);
+		zend_hash_str_add(Z_ARR_P(return_value), "__states", strlen("__states"), &t);
 		if (!engine->engine.algo->serialize(engine->engine.state, Z_ARRVAL(t))) {
 			zend_throw_exception(NULL, "Engine serialize failed", 0);
 			RETURN_THROWS();
 		}
-		zend_hash_str_add(Z_ARR_P(return_value), "__states", strlen("__states"), &t);
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -392,11 +392,11 @@ PHP_METHOD(Random_Engine_Mt19937, __debugInfo)`
`392`	`392`
`393`	`393`	`if (engine->engine.algo->serialize) {`
`394`	`394`	`array_init(&t);`
	`395`	`+ zend_hash_str_add(Z_ARR_P(return_value), "__states", strlen("__states"), &t);`
`395`	`396`	`if (!engine->engine.algo->serialize(engine->engine.state, Z_ARRVAL(t))) {`
`396`	`397`	`zend_throw_exception(NULL, "Engine serialize failed", 0);`
`397`	`398`	`RETURN_THROWS();`
`398`	`399`	`}`
`399`		`- zend_hash_str_add(Z_ARR_P(return_value), "__states", strlen("__states"), &t);`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`	`/* }}} */`