clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:php/php-src

Browse Source 
* 'master' of github.com:php/php-src:
  Use 16 instead of 15 bytes of random data in ReflectionReference->getId (#7148)
  Fix test wrt. OPENSSL_CONF
This commit is contained in:
Joe Watkins 2021-06-13 22:12:09 +02:00
commit ce41e22edc
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/openssl/tests/check_default_conf_path.phpt
View File

@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
die('skip windows only test');
}
?>
--ENV--
OPENSSL_CONF=
--FILE--
<?php

2
ext/reflection/php_reflection.c
View File

@ -6370,7 +6370,7 @@ ZEND_METHOD(ReflectionReference, getId)
}
if (!REFLECTION_G(key_initialized)) {
if (php_random_bytes_throw(&REFLECTION_G(key_initialized), 16) == FAILURE) {
if (php_random_bytes_throw(&REFLECTION_G(key), 16) == FAILURE) {
RETURN_THROWS();
}