generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-25 15:19:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #433 from siemens/numparser

Browse Source 
NumberParser::parseUnsigned should not parse negative numbers
This commit is contained in:
Günter Obiltschnig
2014-04-28 17:28:38 +02:00
parent 695ba1b0ee d9a594e184
commit f19d1cb041
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/include/Poco/NumericString.h
View File

@@ -110,6 +110,8 @@ bool strToInt(const char* pStr, I& result, short base, char thSep = ',')
char sign = 1; char sign = 1;
if ((base == 10) && (*pStr == '-')) if ((base == 10) && (*pStr == '-'))
{ {
// Unsigned types can't be negative so abort parsing
if (std::numeric_limits<I>::min() >= 0) return false;
sign = -1; sign = -1;
++pStr; ++pStr;
} }

6
Foundation/testsuite/src/NumberParserTest.cpp
View File

@@ -272,6 +272,12 @@ void NumberParserTest::testParseError()
failmsg("must throw SyntaxException"); failmsg("must throw SyntaxException");
} catch (SyntaxException&) { } } catch (SyntaxException&) { }
try
{
NumberParser::parseUnsigned("-123");
failmsg("must throw SyntaxException");
} catch (SyntaxException&) { }
try try
{ {
NumberParser::parseHex("z23"); NumberParser::parseHex("z23");