ext/random: Fix signess issues

Author: Girgias

ext/random/random.c

@@ -338,9 +338,10 @@ PHPAPI zend_string *php_random_bin2hex_le(const void *ptr, const size_t len)
 	i = 0;
 #ifdef WORDS_BIGENDIAN
 	/* force little endian */
-	for (zend_long j = (len - 1); 0 <= j; j--) {
+	for (size_t h = len; 0 < h; h--) {
+		size_t j = h-1;
 #else
-	for (zend_long j = 0; j < len; j++) {
+	for (size_t j = 0; j < len; j++) {
 #endif
 		ZSTR_VAL(str)[i++] = hexconvtab[((unsigned char *) ptr)[j] >> 4];
 		ZSTR_VAL(str)[i++] = hexconvtab[((unsigned char *) ptr)[j] & 15];
@@ -362,9 +363,10 @@ PHPAPI bool php_random_hex2bin_le(zend_string *hexstr, void *dest)
 
 #ifdef WORDS_BIGENDIAN
 	/* force little endian */
-	for (zend_long j = (len - 1); 0 <= j; j--) {
+	for (size_t h = len; 0 < h; h--) {
+		size_t j = h-1;
 #else
-	for (zend_long j = 0; j < len; j++) {
+	for (size_t j = 0; j < len; j++) {
 #endif
 		c = str[i++];
 		l = c & ~0x20;
@@ -673,7 +675,7 @@ PHPAPI uint64_t php_random_generate_fallback_seed(void)
 
 	uint64_t result = 0;
 
-	for (int i = 0; i < sizeof(result); i++) {
+	for (size_t i = 0; i < sizeof(result); i++) {
 		result = result | (((uint64_t)RANDOM_G(fallback_seed)[i]) << (i * 8));
 	}
 

ext/random/randomizer.c

@@ -277,18 +277,19 @@ PHP_METHOD(Random_Randomizer, getBytes)
 	php_random_algo_with_state engine = randomizer->engine;
 
 	zend_string *retval;
-	zend_long length;
+	zend_long user_length;
 	size_t total_size = 0;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_LONG(length)
+		Z_PARAM_LONG(user_length)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (length < 1) {
+	if (user_length < 1) {
 		zend_argument_value_error(1, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
+	size_t length = (size_t)user_length;
 	retval = zend_string_alloc(length, 0);
 
 	while (total_size < length) {
@@ -385,13 +386,13 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
 	php_random_algo_with_state engine = randomizer->engine;
 
-	zend_long length;
+	zend_long user_length;
 	zend_string *source, *retval;
 	size_t total_size = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2);
 		Z_PARAM_STR(source)
-		Z_PARAM_LONG(length)
+		Z_PARAM_LONG(user_length)
 	ZEND_PARSE_PARAMETERS_END();
 
 	const size_t source_length = ZSTR_LEN(source);
@@ -402,11 +403,12 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 		RETURN_THROWS();
 	}
 
-	if (length < 1) {
+	if (user_length < 1) {
 		zend_argument_value_error(2, "must be greater than 0");
 		RETURN_THROWS();
 	}
 
+	size_t length = (size_t)user_length;
 	retval = zend_string_alloc(length, 0);
 
 	if (max_offset > 0xff) {