generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-15 23:20:06 +02:00
Code Issues Projects Releases Wiki Activity

fix GH #931: make strToInt() more strict in what it accepts

Browse Source
This commit is contained in:
Guenter Obiltschnig
2015-09-09 11:14:29 +02:00
parent 913f2e84b4
commit b083364a94
3 changed files with 17 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,9 +107,6 @@ bool strToInt(const char* pStr, I& result, short base, char thSep = ',')
{
switch (*pStr)
{
case 'x': case 'X':
if (base != 0x10) return false;
case '0':
if (state < STATE_SIGNIFICANT_DIGITS) break;
@@ -142,19 +139,12 @@ bool strToInt(const char* pStr, I& result, short base, char thSep = ',')
case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
if (base != 0x10) return false;
if (state < STATE_SIGNIFICANT_DIGITS) state = STATE_SIGNIFICANT_DIGITS;
if (result > limitCheck) return false;
result = result * base + (10 + *pStr - 'A');
break;
case 'U':
case 'u':
case 'L':
case 'l':
goto done;
case '.':
if ((base == 10) && (thSep == '.')) break;
else return false;
@@ -165,19 +155,13 @@ bool strToInt(const char* pStr, I& result, short base, char thSep = ',')
case ' ':
if ((base == 10) && (thSep == ' ')) break;
case '\t':
case '\n':
case '\v':
case '\f':
case '\r':
goto done;
// fallthrough
default:
return false;
}
}
done:
if ((sign < 0) && (base == 10)) result *= sign;
return true;