hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes?

Browse source
This commit is contained in:
Thulinma 2024-06-17 13:47:48 +02:00
parent f96a7201cf
commit 110c1a0013
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/util.cpp
View file

@ -306,11 +306,14 @@ namespace Util{
/// Secure random bytes generator
/// Uses /dev/urandom internally
void getRandomBytes(void * dest, size_t len){
static FILE * randSource = fopen("/dev/urandom", "rb");
if (fread((void *)dest, len, 1, randSource) != 1){
std::ifstream rndSrc("/dev/urandom", std::ifstream::binary);
rndSrc.read((char*)dest, len);
size_t cnt = rndSrc.gcount();
if (!rndSrc.good()){
WARN_MSG("Reading random data failed - generating using rand() as backup");
for (size_t i = 0; i < len; ++i){((char*)dest)[i] = rand() % 255;}
for (size_t i = cnt; i < len; ++i){((char*)dest)[i] = rand() % 255;}
}
rndSrc.close();
}
/// 64-bits version of ftell

3
src/controller/controller_statistics.cpp
View file

@ -385,7 +385,7 @@ void Controller::SharedMemStats(void *config){
while (((Util::Config *)config)->is_active){
{
std::ifstream cpustat("/proc/stat");
if (cpustat){
if (cpustat.good()){
char line[300];
while (cpustat.getline(line, 300)){
static uint64_t cl_total = 0, cl_idle = 0;
@ -403,6 +403,7 @@ void Controller::SharedMemStats(void *config){
}
}
}
cpustat.close();
}
{
tthread::lock_guard<tthread::mutex> guard(Controller::configMutex);