diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-09 15:02:57 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-09 15:02:57 +0200 |
| commit | 4276d669d23c6f8cab3f71a8ad93397ec160b3eb (patch) | |
| tree | a25d9e8542186b94f11a96bec0c6338575aaf80e /ext/openssl | |
| parent | 3b2f2ce4748328fc696cd3d27887bf61e22ca023 (diff) | |
| parent | 69a771346a649d993cc19362f3966a8f59e95d75 (diff) | |
| download | php-git-4276d669d23c6f8cab3f71a8ad93397ec160b3eb.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/openssl.c | 2 | ||||
| -rw-r--r-- | ext/openssl/tests/bug78391.phpt | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 425bed4c2b..5e9528afd5 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -7012,7 +7012,7 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) zend_long buffer_length; zval *zstrong_result_returned = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|z/", &buffer_length, &zstrong_result_returned) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|z", &buffer_length, &zstrong_result_returned) == FAILURE) { return; } diff --git a/ext/openssl/tests/bug78391.phpt b/ext/openssl/tests/bug78391.phpt new file mode 100644 index 0000000000..936ef262b2 --- /dev/null +++ b/ext/openssl/tests/bug78391.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #78391: Assertion failure in openssl_random_pseudo_bytes +--FILE-- +<?php + +$isStrongCrypto = false; +var_dump(strlen(openssl_random_pseudo_bytes(16, $isStrongCrypto))); +var_dump($isStrongCrypto); + +?> +--EXPECT-- +int(16) +bool(true) |