valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Validate string to double using std::isfinite

Browse source
This commit is contained in:
krcroft 2020-03-31 10:31:08 -07:00 • committed by Patryk Obara
parent 239396fec8
commit 75dd033cb0
3 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/dos/program_autotype.cpp
View file

@ -83,15 +83,15 @@ bool AUTOTYPE::ReadDoubleArg(const std::string &name,
std::string str_value;
// Is the user trying to set this flag?
if (cmd->FindString(flag, str_value, true)) {
double user_value;
// Can the user's value be parsed?
if (str_to_double(str_value, user_value)) {
const double user_value = to_finite<double>(str_value);
if (std::isfinite(user_value)) {
result = true;
// Clamp the user's value if needed
value = clamp(user_value, min_value, max_value);
// If we had to clamp the users value, then inform them
// Inform them if we had to clamp their value
if (std::fabs(user_value - value) > std::numeric_limits<double>::epsilon())
WriteOut("AUTOTYPE: bounding %s value of %.2f to %.2f\n",
name.c_str(), user_value, value);

11
src/misc/support.cpp
View file

@ -35,17 +35,6 @@
#include "support.h"
#include "video.h"
bool str_to_double(const std::string& input, double &value) {
bool result = false;
size_t bytes_read = 0;
try {
value = std::stod(input, &bytes_read);
if (bytes_read == input.size())
result = true;
} catch (std::invalid_argument &) {}
return result;
}
std::string get_basename(const std::string& filename) {
// Guard against corner cases: '', '/', '\', 'a'
if (filename.length() <= 1)