random: Mark EG(exception) branches as UNEXPECTED

see php#13138 (comment)

Author: TimWolla

ext/random/engine_mt19937.c

@@ -296,7 +296,7 @@ PHP_METHOD(Random_Engine_Mt19937, generate)
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	php_random_result generated = engine->algo->generate(engine->status);
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		RETURN_THROWS();
 	}
 
@@ -361,7 +361,7 @@ PHP_METHOD(Random_Engine_Mt19937, __unserialize)
 		RETURN_THROWS();
 	}
 	object_properties_load(&engine->std, Z_ARRVAL_P(t));
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
 		RETURN_THROWS();
 	}

ext/random/engine_user.c

@@ -30,7 +30,7 @@ static php_random_result generate(php_random_status *status)
 
 	zend_call_known_instance_method_with_0_params(s->generate_method, s->object, &retval);
 
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		return (php_random_result){
 			.size = sizeof(uint64_t),
 			.result = 0,

ext/random/random.c

@@ -86,7 +86,7 @@ PHPAPI uint32_t php_random_range32(const php_random_algo *algo, php_random_statu
 		php_random_result r = algo->generate(status);
 		result = result | (((uint32_t) r.result) << (total_size * 8));
 		total_size += r.size;
-		if (EG(exception)) {
+		if (UNEXPECTED(EG(exception))) {
 			return 0;
 		}
 	} while (total_size < sizeof(uint32_t));
@@ -121,7 +121,7 @@ PHPAPI uint32_t php_random_range32(const php_random_algo *algo, php_random_statu
 			php_random_result r = algo->generate(status);
 			result = result | (((uint32_t) r.result) << (total_size * 8));
 			total_size += r.size;
-			if (EG(exception)) {
+			if (UNEXPECTED(EG(exception))) {
 				return 0;
 			}
 		} while (total_size < sizeof(uint32_t));
@@ -142,7 +142,7 @@ PHPAPI uint64_t php_random_range64(const php_random_algo *algo, php_random_statu
 		php_random_result r = algo->generate(status);
 		result = result | (r.result << (total_size * 8));
 		total_size += r.size;
-		if (EG(exception)) {
+		if (UNEXPECTED(EG(exception))) {
 			return 0;
 		}
 	} while (total_size < sizeof(uint64_t));
@@ -177,7 +177,7 @@ PHPAPI uint64_t php_random_range64(const php_random_algo *algo, php_random_statu
 			php_random_result r = algo->generate(status);
 			result = result | (r.result << (total_size * 8));
 			total_size += r.size;
-			if (EG(exception)) {
+			if (UNEXPECTED(EG(exception))) {
 				return 0;
 			}
 		} while (total_size < sizeof(uint64_t));

ext/random/randomizer.c

@@ -81,7 +81,7 @@ PHP_METHOD(Random_Randomizer, __construct)
 
 	OBJ_RELEASE(Z_OBJ_P(&engine));
 
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		RETURN_THROWS();
 	}
 
@@ -104,7 +104,7 @@ PHP_METHOD(Random_Randomizer, nextFloat)
 		php_random_result r = randomizer->algo->generate(randomizer->status);
 		result = result | (r.result << (total_size * 8));
 		total_size += r.size;
-		if (EG(exception)) {
+		if (UNEXPECTED(EG(exception))) {
 			RETURN_THROWS();
 		}
 	} while (total_size < sizeof(uint64_t));
@@ -212,7 +212,7 @@ PHP_METHOD(Random_Randomizer, nextInt)
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	php_random_result result = randomizer->algo->generate(randomizer->status);
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		RETURN_THROWS();
 	}
 	if (result.size > sizeof(zend_long)) {
@@ -257,7 +257,7 @@ PHP_METHOD(Random_Randomizer, getInt)
 		result = randomizer->algo->range(randomizer->status, min, max);
 	}
 
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		RETURN_THROWS();
 	}
 
@@ -286,7 +286,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
 
 	while (total_size < length) {
 		php_random_result result = randomizer->algo->generate(randomizer->status);
-		if (EG(exception)) {
+		if (UNEXPECTED(EG(exception))) {
 			zend_string_free(retval);
 			RETURN_THROWS();
 		}
@@ -405,7 +405,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 		while (total_size < length) {
 			uint64_t offset = randomizer->algo->range(randomizer->status, 0, max_offset);
 
-			if (EG(exception)) {
+			if (UNEXPECTED(EG(exception))) {
 				zend_string_free(retval);
 				RETURN_THROWS();
 			}
@@ -425,7 +425,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 		int failures = 0;
 		while (total_size < length) {
 			php_random_result result = randomizer->algo->generate(randomizer->status);
-			if (EG(exception)) {
+			if (UNEXPECTED(EG(exception))) {
 				zend_string_free(retval);
 				RETURN_THROWS();
 			}
@@ -497,7 +497,7 @@ PHP_METHOD(Random_Randomizer, __unserialize)
 		RETURN_THROWS();
 	}
 	object_properties_load(&randomizer->std, Z_ARRVAL_P(members_zv));
-	if (EG(exception)) {
+	if (UNEXPECTED(EG(exception))) {
 		zend_throw_exception(NULL, "Invalid serialization data for Random\\Randomizer object", 0);
 		RETURN_THROWS();
 	}