mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround differences between libc and libstd string stream parsing of float/doubles.

Browse Source 
libc and libstd differ on how they parse strings. This has a remote
chance of breaking mods and 0 A.D. code, and it broke tests on MacOS.

Add a workaround to ensure they are consistent.

Comments by: vladislavbelov
Fixes #2780

Differential Revision: https://code.wildfiregames.com/D1988
This was SVN commit r22908.
This commit is contained in:
wraitii
2019-09-15 12:02:26 +00:00
parent 5faf540980
commit c6e5c83b6d
2 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/CStr.cpp
+18 -3
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2014 Wildfire Games.
/* Copyright (C) 2019 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -31,6 +31,7 @@
#include "lib/byte_order.h"
#include "network/Serialization.h"
#include <cctype>
#include <iomanip>
#include <sstream>
@@ -154,10 +155,24 @@ unsigned long CStr::ToULong() const
return ret;
}
/**
* libc++ and libstd++ differ on how they handle string-to-number parsing for floating-points numbers.
* See https://trac.wildfiregames.com/ticket/2780#comment:4 for details.
* To prevent this, only consider [0-9.-+], replace the others in-place with a neutral character.
*/
CStr ParseableAsNumber(CStr cleaned_copy)
{
for (tchar& c : cleaned_copy)
if (!std::isdigit(c) && c != '.' && c != '-' && c != '+')
c = ' ';
return cleaned_copy;
}
float CStr::ToFloat() const
{
float ret = 0;
std::tstringstream str(*this);
std::tstringstream str(ParseableAsNumber(*this));
str >> ret;
return ret;
}
@@ -165,7 +180,7 @@ float CStr::ToFloat() const
double CStr::ToDouble() const
{
double ret = 0;
std::tstringstream str(*this);
std::tstringstream str(ParseableAsNumber(*this));
str >> ret;
return ret;
}