From 5d6510777f8210548fbb362cf6a983d6e3f74515 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Sun, 31 Jul 2022 23:40:16 +0300 Subject: [PATCH 1/4] PCG64: $advance must be non-negative --- ext/random/engine_pcgoneseq128xslrr64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/random/engine_pcgoneseq128xslrr64.c b/ext/random/engine_pcgoneseq128xslrr64.c index 7f15c839d3372..3f3600d86ea6a 100644 --- a/ext/random/engine_pcgoneseq128xslrr64.c +++ b/ext/random/engine_pcgoneseq128xslrr64.c @@ -186,6 +186,10 @@ PHP_METHOD(Random_Engine_PcgOneseq128XslRr64, jump) Z_PARAM_LONG(advance); ZEND_PARSE_PARAMETERS_END(); + if (UNEXPECTED(advance < 0)) { + zend_argument_value_error(1, "must be greater than or equal to 0"); + } + php_random_pcgoneseq128xslrr64_advance(state, advance); } /* }}} */ From 5887776d3f7f088291f690fbad9bc04a645f5512 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Mon, 1 Aug 2022 04:36:28 +0300 Subject: [PATCH 2/4] Missing return_throws --- ext/random/engine_pcgoneseq128xslrr64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/random/engine_pcgoneseq128xslrr64.c b/ext/random/engine_pcgoneseq128xslrr64.c index 3f3600d86ea6a..49b72788167de 100644 --- a/ext/random/engine_pcgoneseq128xslrr64.c +++ b/ext/random/engine_pcgoneseq128xslrr64.c @@ -188,6 +188,7 @@ PHP_METHOD(Random_Engine_PcgOneseq128XslRr64, jump) if (UNEXPECTED(advance < 0)) { zend_argument_value_error(1, "must be greater than or equal to 0"); + RETURN_THROWS(); } php_random_pcgoneseq128xslrr64_advance(state, advance); From 9ac119a6235a26ef7abcd072adcb35e28d74f40e Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Mon, 1 Aug 2022 04:56:12 +0300 Subject: [PATCH 3/4] Add test for PcgOneseq128XslRr64::jump() --- .../pcgoneseq128xslrr64_jump_error.phpt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt diff --git a/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt b/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt new file mode 100644 index 0000000000000..42a0fe7552e76 --- /dev/null +++ b/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt @@ -0,0 +1,22 @@ +--TEST-- +Random: Engine: PcgOneseq128XslRr64: Jump with negative $advance +--FILE-- +jump(-1); +} catch (ValueError $e) { + echo $e->getMessage(), PHP_EOL; +} + +if ($engine->generate() !== $referenceEngine->generate()) { + die('failure: state changed'); +} + +die('success'); +--EXPECT-- +Random\Engine\PcgOneseq128XslRr64::jump(): Argument #1 ($advance) must be greater than or equal to 0 +success From 8db8ec66fabc841ba58ffa4c4580e681ff9672d1 Mon Sep 17 00:00:00 2001 From: Anton Smirnov Date: Mon, 1 Aug 2022 13:58:05 +0300 Subject: [PATCH 4/4] Add closing tag to the test --- ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt b/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt index 42a0fe7552e76..207c146acb30c 100644 --- a/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt +++ b/ext/random/tests/02_engine/pcgoneseq128xslrr64_jump_error.phpt @@ -17,6 +17,7 @@ if ($engine->generate() !== $referenceEngine->generate()) { } die('success'); +?> --EXPECT-- Random\Engine\PcgOneseq128XslRr64::jump(): Argument #1 ($advance) must be greater than or equal to 0 success