Use specialized functions/macros to reduce code size in ext/random (#18499)

nielsdos · web-flow · commit a9b84f942599 · 2025-05-05T19:12:39.000+02:00
On x86-64 with GCC 14.2.1:
zim_Random_Randomizer_getBytes goes from 514 to 418 bytes
zim_Random_Randomizer_getBytesFromString goes from 750 to 676 bytes
diff --git a/ext/random/randomizer.c b/ext/random/randomizer.c
@@ -297,7 +297,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
 	while (total_size + 8 <= length) {
 		result = engine.algo->generate(engine.state);
 		if (EG(exception)) {
-			zend_string_free(retval);
+			zend_string_efree(retval);
 			RETURN_THROWS();
 		}
 
@@ -326,7 +326,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
 	while (total_size < length) {
 		result = engine.algo->generate(engine.state);
 		if (EG(exception)) {
-			zend_string_free(retval);
+			zend_string_efree(retval);
 			RETURN_THROWS();
 		}
 
@@ -342,7 +342,7 @@ PHP_METHOD(Random_Randomizer, getBytes)
 	}
 
 	ZSTR_VAL(retval)[length] = '\0';
-	RETURN_STR(retval);
+	RETURN_NEW_STR(retval);
 }
 /* }}} */
 
@@ -451,7 +451,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 			uint64_t offset = engine.algo->range(engine.state, 0, max_offset);
 
 			if (EG(exception)) {
-				zend_string_free(retval);
+				zend_string_efree(retval);
 				RETURN_THROWS();
 			}
 
@@ -473,7 +473,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 		while (total_size < length) {
 			php_random_result result = engine.algo->generate(engine.state);
 			if (EG(exception)) {
-				zend_string_free(retval);
+				zend_string_efree(retval);
 				RETURN_THROWS();
 			}
 
@@ -484,7 +484,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 
 				if (offset > max_offset) {
 					if (++failures > PHP_RANDOM_RANGE_ATTEMPTS) {
-						zend_string_free(retval);
+						zend_string_efree(retval);
 						zend_throw_error(random_ce_Random_BrokenRandomEngineError, "Failed to generate an acceptable random number in %d attempts", PHP_RANDOM_RANGE_ATTEMPTS);
 						RETURN_THROWS();
 					}
@@ -503,7 +503,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
 	}
 
 	ZSTR_VAL(retval)[length] = '\0';
-	RETURN_STR(retval);
+	RETURN_NEW_STR(retval);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ PHP_METHOD(Random_Randomizer, getBytes)`
`297`	`297`	`while (total_size + 8 <= length) {`
`298`	`298`	`result = engine.algo->generate(engine.state);`
`299`	`299`	`if (EG(exception)) {`
`300`		`- zend_string_free(retval);`
	`300`	`+ zend_string_efree(retval);`
`301`	`301`	`RETURN_THROWS();`
`302`	`302`	`}`
`303`	`303`
`@@ -326,7 +326,7 @@ PHP_METHOD(Random_Randomizer, getBytes)`
`326`	`326`	`while (total_size < length) {`
`327`	`327`	`result = engine.algo->generate(engine.state);`
`328`	`328`	`if (EG(exception)) {`
`329`		`- zend_string_free(retval);`
	`329`	`+ zend_string_efree(retval);`
`330`	`330`	`RETURN_THROWS();`
`331`	`331`	`}`
`332`	`332`
`@@ -342,7 +342,7 @@ PHP_METHOD(Random_Randomizer, getBytes)`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`ZSTR_VAL(retval)[length] = '\0';`
`345`		`- RETURN_STR(retval);`
	`345`	`+ RETURN_NEW_STR(retval);`
`346`	`346`	`}`
`347`	`347`	`/* }}} */`
`348`	`348`
`@@ -451,7 +451,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)`
`451`	`451`	`uint64_t offset = engine.algo->range(engine.state, 0, max_offset);`
`452`	`452`
`453`	`453`	`if (EG(exception)) {`
`454`		`- zend_string_free(retval);`
	`454`	`+ zend_string_efree(retval);`
`455`	`455`	`RETURN_THROWS();`
`456`	`456`	`}`
`457`	`457`
`@@ -473,7 +473,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)`
`473`	`473`	`while (total_size < length) {`
`474`	`474`	`php_random_result result = engine.algo->generate(engine.state);`
`475`	`475`	`if (EG(exception)) {`
`476`		`- zend_string_free(retval);`
	`476`	`+ zend_string_efree(retval);`
`477`	`477`	`RETURN_THROWS();`
`478`	`478`	`}`
`479`	`479`
`@@ -484,7 +484,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)`
`484`	`484`
`485`	`485`	`if (offset > max_offset) {`
`486`	`486`	`if (++failures > PHP_RANDOM_RANGE_ATTEMPTS) {`
`487`		`- zend_string_free(retval);`
	`487`	`+ zend_string_efree(retval);`
`488`	`488`	`zend_throw_error(random_ce_Random_BrokenRandomEngineError, "Failed to generate an acceptable random number in %d attempts", PHP_RANDOM_RANGE_ATTEMPTS);`
`489`	`489`	`RETURN_THROWS();`
`490`	`490`	`}`
`@@ -503,7 +503,7 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`ZSTR_VAL(retval)[length] = '\0';`
`506`		`- RETURN_STR(retval);`
	`506`	`+ RETURN_NEW_STR(retval);`
`507`	`507`	`}`
`508`	`508`	`/* }}} */`
`509`	`509`