Throw BrokenRandomEngineError

Author: TimWolla

ext/random/engine_user.c

@@ -49,7 +49,7 @@ static uint64_t generate(php_random_status *status)
 			result += ((uint64_t) (unsigned char) Z_STRVAL(retval)[i]) << (8 * i);
 		}
 	} else {
-		zend_throw_error(NULL, "A random engine must return a non-empty string");
+		zend_throw_error(random_ce_Random_BrokenRandomEngineError, "A random engine must return a non-empty string");
 		return 0;
 	}
 

ext/random/random.c

@@ -126,7 +126,7 @@ static inline uint32_t rand_range32(const php_random_algo *algo, php_random_stat
 	while (UNEXPECTED(result > limit)) {
 		/* If the requirements cannot be met in a cycles, return fail */
 		if (++count > RANDOM_RANGE_ATTEMPTS) {
-			zend_throw_error(NULL, "Failed to generate an acceptable random number in %d attempts", RANDOM_RANGE_ATTEMPTS);
+			zend_throw_error(random_ce_Random_BrokenRandomEngineError, "Failed to generate an acceptable random number in %d attempts", RANDOM_RANGE_ATTEMPTS);
 			return 0;
 		}
 
@@ -182,7 +182,7 @@ static inline uint64_t rand_range64(const php_random_algo *algo, php_random_stat
 	while (UNEXPECTED(result > limit)) {
 		/* If the requirements cannot be met in a cycles, return fail */
 		if (++count > RANDOM_RANGE_ATTEMPTS) {
-			zend_throw_error(NULL, "Failed to generate an acceptable random number in %d attempts", RANDOM_RANGE_ATTEMPTS);
+			zend_throw_error(random_ce_Random_BrokenRandomEngineError, "Failed to generate an acceptable random number in %d attempts", RANDOM_RANGE_ATTEMPTS);
 			return 0;
 		}
 

ext/random/tests/03_randomizer/user_unsafe.phpt

@@ -74,35 +74,35 @@ foreach ([
 EmptyStringEngine
 =====================
 
-Error: A random engine must return a non-empty string in %s:%d
+Random\BrokenRandomEngineError: A random engine must return a non-empty string in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->getInt(0, 123)
 #1 {main}
 
 -------
 
-Error: A random engine must return a non-empty string in %s:%d
+Random\BrokenRandomEngineError: A random engine must return a non-empty string in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->nextInt()
 #1 {main}
 
 -------
 
-Error: A random engine must return a non-empty string in %s:%d
+Random\BrokenRandomEngineError: A random engine must return a non-empty string in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->getBytes(1)
 #1 {main}
 
 -------
 
-Error: A random engine must return a non-empty string in %s:%d
+Random\BrokenRandomEngineError: A random engine must return a non-empty string in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->shuffleArray(Array)
 #1 {main}
 
 -------
 
-Error: A random engine must return a non-empty string in %s:%d
+Random\BrokenRandomEngineError: A random engine must return a non-empty string in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->shuffleBytes('foobar')
 #1 {main}
@@ -111,7 +111,7 @@ Stack trace:
 HeavilyBiasedEngine
 =====================
 
-Error: Failed to generate an acceptable random number in 50 attempts in %s:%d
+Random\BrokenRandomEngineError: Failed to generate an acceptable random number in 50 attempts in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->getInt(0, 123)
 #1 {main}
@@ -126,14 +126,14 @@ string(2) "ff"
 
 -------
 
-Error: Failed to generate an acceptable random number in 50 attempts in %s:%d
+Random\BrokenRandomEngineError: Failed to generate an acceptable random number in 50 attempts in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->shuffleArray(Array)
 #1 {main}
 
 -------
 
-Error: Failed to generate an acceptable random number in 50 attempts in %s:%d
+Random\BrokenRandomEngineError: Failed to generate an acceptable random number in 50 attempts in %s:%d
 Stack trace:
 #0 %s(%d): Random\Randomizer->shuffleBytes('foobar')
 #1 {main}