Merge branch 'PHP-8.5'

ndossche · ndossche · commit 928af45bda16 · 2025-11-04T08:33:55.000+01:00
* PHP-8.5: random: Fix memory leak when serialization fails (php#20383)
diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
@@ -329,11 +329,11 @@ PHP_METHOD(Random_Engine_Mt19937, __serialize)
 
 	/* state */
 	array_init(&t);
+	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 	if (!engine->engine.algo->serialize(engine->engine.state, Z_ARRVAL(t))) {
 		zend_throw_exception(NULL, "Engine serialize failed", 0);
 		RETURN_THROWS();
 	}
-	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -329,11 +329,11 @@ PHP_METHOD(Random_Engine_Mt19937, __serialize)`
`329`	`329`
`330`	`330`	`/* state */`
`331`	`331`	`array_init(&t);`
	`332`	`+ zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);`
`332`	`333`	`if (!engine->engine.algo->serialize(engine->engine.state, Z_ARRVAL(t))) {`
`333`	`334`	`zend_throw_exception(NULL, "Engine serialize failed", 0);`
`334`	`335`	`RETURN_THROWS();`
`335`	`336`	`}`
`336`		`- zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);`
`337`	`337`	`}`
`338`	`338`	`/* }}} */`
`339`	`339`