0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix uninitialized rng seed (reported by valgrind)

Browse source 
This probably didn't happen in practice or we would notice I think,
but it happened because of a failure to check stringstream failing
to parse a string to hex.
This commit is contained in:
Chris Beck 2015-04-06 21:20:34 -04:00
parent 29c99fe870
commit ab49e328b9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mt_rng.cpp
View file

@ -89,13 +89,19 @@ void mt_rng::seed_random(const std::string & seed_str, const unsigned int call_c
{
uint32_t new_seed;
std::istringstream s(seed_str);
s >> std::hex >> new_seed;
if (!(s >> std::hex >> new_seed)) {
new_seed = 42;
DBG_RND << "Failed to seed a random number generator using seed string '" << seed_str << "', it could not be parsed to hex. Seeding with 42.\n";
}
seed_random(new_seed, call_count);
}
std::string mt_rng::get_random_seed_str() const {
std::stringstream stream;
stream << std::setfill('0') << std::setw(sizeof(uint32_t)*2) << std::hex << random_seed_;
stream << std::setfill('0');
stream << std::setw(sizeof(uint32_t)*2);
stream << std::hex;
stream << random_seed_;
return stream.str();
}