Skip to content

fix random_bytes(0) and Random\Randomizer::getBytes(0) #12216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix random_bytes(0) and Random\Randomizer::getBytes(0) #12216

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cb7aeb
fix random_bytes(0);
divinity76 Sep 15, 2023
c56fe83
fix Randomizer::getBytes(0) and other PR feedback
divinity76 Sep 15, 2023
326094a
remove support for getBytesFromString("",0);
divinity76 Sep 22, 2023
edeeb3d
Update ext/random/tests/03_randomizer/methods/getBytes.phpt
divinity76 Sep 24, 2023
e386a0f
Merge branch 'master' into fix-random-bytes-0
divinity76 Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/random/random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,8 @@ PHP_FUNCTION(random_bytes)
Z_PARAM_LONG(size)
ZEND_PARSE_PARAMETERS_END();

if (size < 1) {
zend_argument_value_error(1, "must be greater than 0");
if (size < 0) {
zend_argument_value_error(1, "must be greater than or equal to 0");
RETURN_THROWS();
}

Expand Down
12 changes: 6 additions & 6 deletions ext/random/randomizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ PHP_METHOD(Random_Randomizer, getBytes)
Z_PARAM_LONG(length)
ZEND_PARSE_PARAMETERS_END();

if (length < 1) {
zend_argument_value_error(1, "must be greater than 0");
if (length < 0) {
zend_argument_value_error(1, "must be greater than or equal to 0");
RETURN_THROWS();
}

Expand Down Expand Up @@ -390,13 +390,13 @@ PHP_METHOD(Random_Randomizer, getBytesFromString)
const size_t source_length = ZSTR_LEN(source);
const size_t max_offset = source_length - 1;

if (source_length < 1) {
zend_argument_value_error(1, "cannot be empty");
if (source_length < 1 && length > 0) {
zend_argument_value_error(1, "cannot be empty when argument #2 ($length) is greater than 0");
RETURN_THROWS();
}

if (length < 1) {
zend_argument_value_error(2, "must be greater than 0");
if (length < 0) {
zend_argument_value_error(2, "must be greater than or equal to 0");
RETURN_THROWS();
}

Expand Down
3 changes: 3 additions & 0 deletions ext/random/tests/01_functions/random_bytes.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Test normal operation of random_bytes()
<?php
//-=-=-=-

var_dump(strlen(random_bytes(0)));

var_dump(strlen(bin2hex(random_bytes(16))));

var_dump(is_string(random_bytes(10)));
Expand All @@ -12,6 +14,7 @@ var_dump(is_string(random_bytes(257)));

?>
--EXPECT--
int(0)
int(32)
bool(true)
bool(true)
4 changes: 2 additions & 2 deletions ext/random/tests/01_functions/random_bytes_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ try {
}

try {
$bytes = random_bytes(0);
$bytes = random_bytes(-1);
} catch (Error $e) {
echo $e->getMessage().PHP_EOL;
}

?>
--EXPECT--
random_bytes() expects exactly 1 argument, 0 given
random_bytes(): Argument #1 ($length) must be greater than 0
random_bytes(): Argument #1 ($length) must be greater than or equal to 0
7 changes: 7 additions & 0 deletions ext/random/tests/03_randomizer/methods/getBytesFromString.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ foreach ($engines as $engine) {
$randomizer = new Randomizer($engine);
var_dump($randomizer->getBytesFromString('a', 10));
var_dump($randomizer->getBytesFromString(str_repeat('a', 256), 5));
var_dump($randomizer->getBytesFromString('', 0));

for ($i = 1; $i < 250; $i++) {
$output = $randomizer->getBytesFromString(str_repeat('ab', $i), 500);
Expand All @@ -48,19 +49,25 @@ Deprecated: The MT_RAND_PHP variant of Mt19937 is deprecated in %s on line %d
Random\Engine\Mt19937
string(10) "aaaaaaaaaa"
string(5) "aaaaa"
string(0) ""
Random\Engine\Mt19937
string(10) "aaaaaaaaaa"
string(5) "aaaaa"
string(0) ""
Random\Engine\PcgOneseq128XslRr64
string(10) "aaaaaaaaaa"
string(5) "aaaaa"
string(0) ""
Random\Engine\Xoshiro256StarStar
string(10) "aaaaaaaaaa"
string(5) "aaaaa"
string(0) ""
Random\Engine\Secure
string(10) "aaaaaaaaaa"
string(5) "aaaaa"
string(0) ""
Random\Engine\Test\TestShaEngine
string(10) "aaaaaaaaaa"
string(5) "aaaaa"
string(0) ""
success
8 changes: 4 additions & 4 deletions ext/random/tests/03_randomizer/methods/getBytesFromString_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ try {
}

try {
var_dump(randomizer()->getBytesFromString("abc", 0));
var_dump(randomizer()->getBytesFromString("abc", -1));
} catch (ValueError $e) {
echo $e->getMessage(), PHP_EOL;
}

?>
--EXPECTF--
Random\Randomizer::getBytesFromString(): Argument #1 ($string) cannot be empty
Random\Randomizer::getBytesFromString(): Argument #2 ($length) must be greater than 0
--EXPECT--
Random\Randomizer::getBytesFromString(): Argument #1 ($string) cannot be empty when argument #2 ($length) is greater than 0
Random\Randomizer::getBytesFromString(): Argument #2 ($length) must be greater than or equal to 0