From a0e7aced7f7ccc21fedfdb378128771b219c822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 5 Oct 2022 20:51:42 +0200 Subject: [PATCH] Reduce scope of `r` in rand_rangeXX This variable is only accessed within a single iteration of the expansion loop. --- ext/random/random.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/random/random.c b/ext/random/random.c index 7cd1bfc8c939..13f1c94c3acf 100644 --- a/ext/random/random.c +++ b/ext/random/random.c @@ -90,14 +90,14 @@ static zend_object_handlers random_randomizer_object_handlers; static inline uint32_t rand_range32(const php_random_algo *algo, php_random_status *status, uint32_t umax) { - uint32_t result, limit, r; + uint32_t result, limit; size_t total_size = 0; uint32_t count = 0; result = 0; total_size = 0; do { - r = algo->generate(status); + uint32_t r = algo->generate(status); result = result | (r << (total_size * 8)); total_size += status->last_generated_size; if (EG(exception)) { @@ -132,7 +132,7 @@ static inline uint32_t rand_range32(const php_random_algo *algo, php_random_stat result = 0; total_size = 0; do { - r = algo->generate(status); + uint32_t r = algo->generate(status); result = result | (r << (total_size * 8)); total_size += status->last_generated_size; if (EG(exception)) { @@ -146,14 +146,14 @@ static inline uint32_t rand_range32(const php_random_algo *algo, php_random_stat static inline uint64_t rand_range64(const php_random_algo *algo, php_random_status *status, uint64_t umax) { - uint64_t result, limit, r; + uint64_t result, limit; size_t total_size = 0; uint32_t count = 0; result = 0; total_size = 0; do { - r = algo->generate(status); + uint64_t r = algo->generate(status); result = result | (r << (total_size * 8)); total_size += status->last_generated_size; if (EG(exception)) { @@ -188,7 +188,7 @@ static inline uint64_t rand_range64(const php_random_algo *algo, php_random_stat result = 0; total_size = 0; do { - r = algo->generate(status); + uint64_t r = algo->generate(status); result = result | (r << (total_size * 8)); total_size += status->last_generated_size; if (EG(exception)) {