F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core (fix #756): Fix CsvReader::GetValueAs() for char

Browse Source
This commit is contained in:
Eduardo Almeida
2022-09-27 14:40:44 +01:00
parent 56d6ad67e3
commit 657ef5346b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/helper/csv-reader.cc
View File

@@ -180,8 +180,8 @@ CsvReader::GetValueAs (std::string input, signed char& value) const
std::int16_t tempOutput = 0;
tempStream >> tempOutput;
if (tempOutput >= std::numeric_limits<byte_type>::min ()
|| tempOutput <= std::numeric_limits<byte_type>::max () )
if (tempOutput >= std::numeric_limits<byte_type>::min () &&
tempOutput <= std::numeric_limits<byte_type>::max () )
{
value = static_cast<byte_type> (tempOutput);
}
@@ -240,8 +240,6 @@ CsvReader::GetValueAs (std::string input, std::string& value) const
bool
CsvReader::GetValueAs (std::string input, unsigned char& value) const
{
NS_LOG_FUNCTION (this << input);
typedef unsigned char byte_type;
NS_LOG_FUNCTION (this << input);
@@ -251,8 +249,8 @@ CsvReader::GetValueAs (std::string input, unsigned char& value) const
std::uint16_t tempOutput = 0;
tempStream >> tempOutput;
if (tempOutput >= std::numeric_limits<byte_type>::min ()
|| tempOutput <= std::numeric_limits<byte_type>::max () )
if (tempOutput >= std::numeric_limits<byte_type>::min () &&
tempOutput <= std::numeric_limits<byte_type>::max () )
{
value = static_cast<byte_type> (tempOutput);
}