ext/random: Add const qualifier

Girgias · Girgias · commit 6d8b9d5dbe77 · 2025-11-16T22:34:08.000Z
diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
@@ -171,9 +171,9 @@ static zend_long range(void *state, zend_long min, zend_long max)
 	}, min, max);
 }
 
-static bool serialize(void *state, HashTable *data)
+static bool serialize(const void *state, HashTable *data)
 {
-	php_random_status_state_mt19937 *s = state;
+	const php_random_status_state_mt19937 *s = state;
 	zval t;
 
 	for (uint32_t i = 0; i < N; i++) {
@@ -188,7 +188,7 @@ static bool serialize(void *state, HashTable *data)
 	return true;
 }
 
-static bool unserialize(void *state, HashTable *data)
+static bool unserialize(void *state, const HashTable *data)
 {
 	php_random_status_state_mt19937 *s = state;
 	zval *t;
diff --git a/ext/random/engine_pcgoneseq128xslrr64.c b/ext/random/engine_pcgoneseq128xslrr64.c
@@ -63,9 +63,9 @@ static zend_long range(void *state, zend_long min, zend_long max)
 	}, min, max);
 }
 
-static bool serialize(void *state, HashTable *data)
+static bool serialize(const void *state, HashTable *data)
 {
-	php_random_status_state_pcgoneseq128xslrr64 *s = state;
+	const php_random_status_state_pcgoneseq128xslrr64 *s = state;
 	uint64_t u;
 	zval z;
 
@@ -80,7 +80,7 @@ static bool serialize(void *state, HashTable *data)
 	return true;
 }
 
-static bool unserialize(void *state, HashTable *data)
+static bool unserialize(void *state, const HashTable *data)
 {
 	php_random_status_state_pcgoneseq128xslrr64 *s = state;
 	uint64_t u[2];
diff --git a/ext/random/engine_xoshiro256starstar.c b/ext/random/engine_xoshiro256starstar.c
@@ -118,9 +118,9 @@ static zend_long range(void *state, zend_long min, zend_long max)
 	}, min, max);
 }
 
-static bool serialize(void *state, HashTable *data)
+static bool serialize(const void *state, HashTable *data)
 {
-	php_random_status_state_xoshiro256starstar *s = state;
+	const php_random_status_state_xoshiro256starstar *s = state;
 	zval t;
 
 	for (uint32_t i = 0; i < 4; i++) {
@@ -131,7 +131,7 @@ static bool serialize(void *state, HashTable *data)
 	return true;
 }
 
-static bool unserialize(void *state, HashTable *data)
+static bool unserialize(void *state, const HashTable *data)
 {
 	php_random_status_state_xoshiro256starstar *s = state;
 
diff --git a/ext/random/php_random.h b/ext/random/php_random.h
@@ -89,8 +89,8 @@ typedef struct _php_random_algo {
 	const size_t state_size;
 	php_random_result (*generate)(void *state);
 	zend_long (*range)(void *state, zend_long min, zend_long max);
-	bool (*serialize)(void *state, HashTable *data);
-	bool (*unserialize)(void *state, HashTable *data);
+	bool (*serialize)(const void *state, HashTable *data);
+	bool (*unserialize)(void *state, const HashTable *data);
 } php_random_algo;
 
 typedef struct _php_random_algo_with_state {
@@ -149,7 +149,7 @@ static inline php_random_randomizer *php_random_randomizer_from_obj(zend_object
 # define Z_RANDOM_RANDOMIZER_P(zval) php_random_randomizer_from_obj(Z_OBJ_P(zval));
 
 PHPAPI void *php_random_status_alloc(const php_random_algo *algo, const bool persistent);
-PHPAPI void *php_random_status_copy(const php_random_algo *algo, void *old_status, void *new_status);
+PHPAPI void *php_random_status_copy(const php_random_algo *algo, const void *old_status, void *new_status);
 PHPAPI void php_random_status_free(void *status, const bool persistent);
 PHPAPI php_random_engine *php_random_engine_common_init(zend_class_entry *ce, const php_random_algo *algo);
 PHPAPI void php_random_engine_common_free_object(zend_object *object);
@@ -169,7 +169,7 @@ static inline php_random_algo_with_state php_random_default_engine(void)
 }
 
 PHPAPI zend_string *php_random_bin2hex_le(const void *ptr, const size_t len);
-PHPAPI bool php_random_hex2bin_le(zend_string *hexstr, void *dest);
+PHPAPI bool php_random_hex2bin_le(const zend_string *hexstr, void *dest);
 
 PHPAPI void php_random_mt19937_seed32(php_random_status_state_mt19937 *state, uint32_t seed);
 PHPAPI void php_random_mt19937_seed_default(php_random_status_state_mt19937 *state);
diff --git a/ext/random/random.c b/ext/random/random.c
@@ -240,7 +240,7 @@ PHPAPI void *php_random_status_alloc(const php_random_algo *algo, const bool per
 	return algo->state_size > 0 ? pecalloc(1, algo->state_size, persistent) : NULL;
 }
 
-PHPAPI void *php_random_status_copy(const php_random_algo *algo, void *old_status, void *new_status)
+PHPAPI void *php_random_status_copy(const php_random_algo *algo, const void *old_status, void *new_status)
 {
 	return memcpy(new_status, old_status, algo->state_size);
 }
@@ -354,10 +354,11 @@ PHPAPI zend_string *php_random_bin2hex_le(const void *ptr, const size_t len)
 
 /* {{{ php_random_hex2bin_le */
 /* stolen from standard/string.c */
-PHPAPI bool php_random_hex2bin_le(zend_string *hexstr, void *dest)
+PHPAPI bool php_random_hex2bin_le(const zend_string *hexstr, void *dest)
 {
 	size_t len = hexstr->len >> 1;
-	unsigned char *str = (unsigned char *) hexstr->val, c, l, d;
+	const unsigned char *str = (unsigned char *) hexstr->val;
+	unsigned char c, l, d;
 	unsigned char *ptr = (unsigned char *) dest;
 	int is_letter, i = 0;
 
@@ -461,7 +462,7 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max)
  * rand() allows min > max, mt_rand does not */
 PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)
 {
-	php_random_status_state_mt19937 *s = php_random_default_status();
+	const php_random_status_state_mt19937 *s = php_random_default_status();
 
 	if (s->mode == MT_RAND_MT19937) {
 		return php_mt_rand_range(min, max);
@@ -632,7 +633,7 @@ PHP_FUNCTION(random_int)
 }
 /* }}} */
 
-static inline void fallback_seed_add(PHP_SHA1_CTX *c, void *p, size_t l){
+static inline void fallback_seed_add(PHP_SHA1_CTX *c, const void *p, size_t l){
 	/* Wrapper around PHP_SHA1Update allowing to pass
 	 * arbitrary pointers without (unsigned char*) casts
 	 * everywhere.
diff --git a/ext/random/randomizer.c b/ext/random/randomizer.c
@@ -86,7 +86,7 @@ PHP_METHOD(Random_Randomizer, __construct)
 /* {{{ Generate a float in [0, 1) */
 PHP_METHOD(Random_Randomizer, nextFloat)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	php_random_algo_with_state engine = randomizer->engine;
 
 	uint64_t result;
@@ -129,7 +129,7 @@ PHP_METHOD(Random_Randomizer, nextFloat)
  */
 PHP_METHOD(Random_Randomizer, getFloat)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	double min, max;
 	zend_object *bounds = NULL;
 	int bounds_type = 'C' + sizeof("ClosedOpen") - 1;
@@ -152,8 +152,8 @@ PHP_METHOD(Random_Randomizer, getFloat)
 	}
 
 	if (bounds) {
-		zval *case_name = zend_enum_fetch_case_name(bounds);
-		zend_string *bounds_name = Z_STR_P(case_name);
+		const zval *case_name = zend_enum_fetch_case_name(bounds);
+		const zend_string *bounds_name = Z_STR_P(case_name);
 
 		bounds_type = ZSTR_VAL(bounds_name)[0] + ZSTR_LEN(bounds_name);
 	}
@@ -203,7 +203,7 @@ PHP_METHOD(Random_Randomizer, getFloat)
 /* {{{ Generate positive random number */
 PHP_METHOD(Random_Randomizer, nextInt)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	php_random_algo_with_state engine = randomizer->engine;
 
 	ZEND_PARSE_PARAMETERS_NONE();
@@ -224,7 +224,7 @@ PHP_METHOD(Random_Randomizer, nextInt)
 /* {{{ Generate random number in range */
 PHP_METHOD(Random_Randomizer, getInt)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	php_random_algo_with_state engine = randomizer->engine;
 
 	uint64_t result;
@@ -267,7 +267,7 @@ PHP_METHOD(Random_Randomizer, getInt)
 /* {{{ Generate random bytes string in ordered length */
 PHP_METHOD(Random_Randomizer, getBytes)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	php_random_algo_with_state engine = randomizer->engine;
 
 	zend_string *retval;
@@ -342,7 +342,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
 /* {{{ Shuffling array */
 PHP_METHOD(Random_Randomizer, shuffleArray)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	zval *array;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -359,7 +359,7 @@ PHP_METHOD(Random_Randomizer, shuffleArray)
 /* {{{ Shuffling binary */
 PHP_METHOD(Random_Randomizer, shuffleBytes)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	zend_string *bytes;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -380,7 +380,7 @@ PHP_METHOD(Random_Randomizer, shuffleBytes)
 /* {{{ Pick keys */
 PHP_METHOD(Random_Randomizer, pickArrayKeys)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	zval *input;
 	zend_long num_req;
 
@@ -412,7 +412,7 @@ PHP_METHOD(Random_Randomizer, pickArrayKeys)
 /* {{{ Get Random Bytes for String */
 PHP_METHOD(Random_Randomizer, getBytesFromString)
 {
-	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
+	const php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	php_random_algo_with_state engine = randomizer->engine;
 
 	zend_long user_length;

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,9 @@ static zend_long range(void *state, zend_long min, zend_long max)`
`171`	`171`	`}, min, max);`
`172`	`172`	`}`
`173`	`173`
`174`		`-static bool serialize(void state, HashTable data)`
	`174`	`+static bool serialize(const void state, HashTable data)`
`175`	`175`	`{`
`176`		`- php_random_status_state_mt19937 *s = state;`
	`176`	`+ const php_random_status_state_mt19937 *s = state;`
`177`	`177`	`zval t;`
`178`	`178`
`179`	`179`	`for (uint32_t i = 0; i < N; i++) {`
`@@ -188,7 +188,7 @@ static bool serialize(void state, HashTable data)`
`188`	`188`	`return true;`
`189`	`189`	`}`
`190`	`190`
`191`		`-static bool unserialize(void state, HashTable data)`
	`191`	`+static bool unserialize(void state, const HashTable data)`
`192`	`192`	`{`
`193`	`193`	`php_random_status_state_mt19937 *s = state;`
`194`	`194`	`zval *t;`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,9 @@ static zend_long range(void *state, zend_long min, zend_long max)`
`63`	`63`	`}, min, max);`
`64`	`64`	`}`
`65`	`65`
`66`		`-static bool serialize(void state, HashTable data)`
	`66`	`+static bool serialize(const void state, HashTable data)`
`67`	`67`	`{`
`68`		`- php_random_status_state_pcgoneseq128xslrr64 *s = state;`
	`68`	`+ const php_random_status_state_pcgoneseq128xslrr64 *s = state;`
`69`	`69`	`uint64_t u;`
`70`	`70`	`zval z;`
`71`	`71`
`@@ -80,7 +80,7 @@ static bool serialize(void state, HashTable data)`
`80`	`80`	`return true;`
`81`	`81`	`}`
`82`	`82`
`83`		`-static bool unserialize(void state, HashTable data)`
	`83`	`+static bool unserialize(void state, const HashTable data)`
`84`	`84`	`{`
`85`	`85`	`php_random_status_state_pcgoneseq128xslrr64 *s = state;`
`86`	`86`	`uint64_t u[2];`
Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,9 @@ static zend_long range(void *state, zend_long min, zend_long max)`
`118`	`118`	`}, min, max);`
`119`	`119`	`}`
`120`	`120`
`121`		`-static bool serialize(void state, HashTable data)`
	`121`	`+static bool serialize(const void state, HashTable data)`
`122`	`122`	`{`
`123`		`- php_random_status_state_xoshiro256starstar *s = state;`
	`123`	`+ const php_random_status_state_xoshiro256starstar *s = state;`
`124`	`124`	`zval t;`
`125`	`125`
`126`	`126`	`for (uint32_t i = 0; i < 4; i++) {`
`@@ -131,7 +131,7 @@ static bool serialize(void state, HashTable data)`
`131`	`131`	`return true;`
`132`	`132`	`}`
`133`	`133`
`134`		`-static bool unserialize(void state, HashTable data)`
	`134`	`+static bool unserialize(void state, const HashTable data)`
`135`	`135`	`{`
`136`	`136`	`php_random_status_state_xoshiro256starstar *s = state;`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ PHPAPI void php_random_status_alloc(const php_random_algo algo, const bool per`
`240`	`240`	`return algo->state_size > 0 ? pecalloc(1, algo->state_size, persistent) : NULL;`
`241`	`241`	`}`
`242`	`242`
`243`		`-PHPAPI void php_random_status_copy(const php_random_algo algo, void old_status, void new_status)`
	`243`	`+PHPAPI void php_random_status_copy(const php_random_algo algo, const void old_status, void new_status)`
`244`	`244`	`{`
`245`	`245`	`return memcpy(new_status, old_status, algo->state_size);`
`246`	`246`	`}`
`@@ -354,10 +354,11 @@ PHPAPI zend_string php_random_bin2hex_le(const void ptr, const size_t len)`
`354`	`354`
`355`	`355`	`/* {{{ php_random_hex2bin_le */`
`356`	`356`	`/* stolen from standard/string.c */`
`357`		`-PHPAPI bool php_random_hex2bin_le(zend_string hexstr, void dest)`
	`357`	`+PHPAPI bool php_random_hex2bin_le(const zend_string hexstr, void dest)`
`358`	`358`	`{`
`359`	`359`	`size_t len = hexstr->len >> 1;`
`360`		`- unsigned char str = (unsigned char ) hexstr->val, c, l, d;`
	`360`	`+ const unsigned char str = (unsigned char ) hexstr->val;`
	`361`	`+ unsigned char c, l, d;`
`361`	`362`	`unsigned char ptr = (unsigned char ) dest;`
`362`	`363`	`int is_letter, i = 0;`
`363`	`364`
`@@ -461,7 +462,7 @@ PHPAPI zend_long php_mt_rand_range(zend_long min, zend_long max)`
`461`	`462`	`* rand() allows min > max, mt_rand does not */`
`462`	`463`	`PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max)`
`463`	`464`	`{`
`464`		`- php_random_status_state_mt19937 *s = php_random_default_status();`
	`465`	`+ const php_random_status_state_mt19937 *s = php_random_default_status();`
`465`	`466`
`466`	`467`	`if (s->mode == MT_RAND_MT19937) {`
`467`	`468`	`return php_mt_rand_range(min, max);`
`@@ -632,7 +633,7 @@ PHP_FUNCTION(random_int)`
`632`	`633`	`}`
`633`	`634`	`/* }}} */`
`634`	`635`
`635`		`-static inline void fallback_seed_add(PHP_SHA1_CTX c, void p, size_t l){`
	`636`	`+static inline void fallback_seed_add(PHP_SHA1_CTX c, const void p, size_t l){`
`636`	`637`	`/* Wrapper around PHP_SHA1Update allowing to pass`
`637`	`638`	`* arbitrary pointers without (unsigned char*) casts`
`638`	`639`	`* everywhere.`