mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

Server: don't abuse random_bytes() to generate integers

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-06 17:22:31 +00:00
parent ab37df4484
commit 836cb67850
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/Server.php
View File

@ -98,7 +98,6 @@ use pocketmine\tile\Tile;
use pocketmine\timings\Timings; use pocketmine\timings\Timings;
use pocketmine\timings\TimingsHandler; use pocketmine\timings\TimingsHandler;
use pocketmine\updater\AutoUpdater; use pocketmine\updater\AutoUpdater;
use pocketmine\utils\Binary;
use pocketmine\utils\Config; use pocketmine\utils\Config;
use pocketmine\utils\Internet; use pocketmine\utils\Internet;
use pocketmine\utils\MainLogger; use pocketmine\utils\MainLogger;
@ -148,6 +147,7 @@ use function pcntl_signal;
use function pcntl_signal_dispatch; use function pcntl_signal_dispatch;
use function preg_replace; use function preg_replace;
use function random_bytes; use function random_bytes;
use function random_int;
use function realpath; use function realpath;
use function register_shutdown_function; use function register_shutdown_function;
use function rename; use function rename;
@ -167,6 +167,8 @@ use function time;
use function touch; use function touch;
use function trim; use function trim;
use const DIRECTORY_SEPARATOR; use const DIRECTORY_SEPARATOR;
use const INT32_MAX;
use const INT32_MIN;
use const PHP_EOL; use const PHP_EOL;
use const PHP_INT_MAX; use const PHP_INT_MAX;
use const PTHREADS_INHERIT_NONE; use const PTHREADS_INHERIT_NONE;
@ -1127,7 +1129,7 @@ class Server{
return false; return false;
} }
$seed = $seed ?? Binary::readInt(random_bytes(4)); $seed = $seed ?? random_int(INT32_MIN, INT32_MAX);
if(!isset($options["preset"])){ if(!isset($options["preset"])){
$options["preset"] = $this->getConfigString("generator-settings", ""); $options["preset"] = $this->getConfigString("generator-settings", "");