zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

back to the roots with tokenizing numbers

Browse Source 
- since atof is just a call to strtod (in glibc at least), revert to the
  original character collection, convert the number via strtod/strtol and
  check the end pointer so see if everything was converted. Flag both bad
  formats (eg, ".e") and trailing junk (eg, "1.e4e") as a tokenize error.
  These were previously silently ignored.

- simple (same weight as before), but with trivial error checking.
  Retain buffer overflow check.
This commit is contained in:
Mark Olesen
2009-08-10 16:10:00 +02:00
parent 8a884892bc
commit d548839a83
1 changed files with 35 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C
View File

@ -183,76 +183,26 @@ Foam::Istream& Foam::ISstream::read(token& t)
case '0' : case '1' : case '2' : case '3' : case '4' :
case '5' : case '6' : case '7' : case '8' : case '9' :
{
// has a digit
bool hasDigit = isdigit(c);
// 0 = before a decimal
// 1 = at/after a decimal
// 2 = in exponent
int floatState = 0;
if (c == '.')
{
floatState = 1;
}
bool asLabel = (c != '.');
unsigned int nChar = 0;
charBuffer[nChar++] = c;
while (is_.get(c))
// get everything that could reasonable look like a number
while
(
is_.get(c)
&& (
isdigit(c)
|| c == '+'
|| c == '-'
|| c == '.'
|| c == 'E'
|| c == 'e'
)
)
{
if (isdigit(c))
{
hasDigit = true;
}
else if (c == '.')
{
// saw '.' or '[Ee]' before
// bad position - stop parsing
if (floatState)
{
break;
}
floatState = 1;
}
else if (c == 'E' || c == 'e')
{
// saw '[Ee]' before, or mantissa had no digits
// bad position - stop parsing
if (floatState > 1 || !hasDigit)
{
break;
}
floatState = 2;
// require some digits again
hasDigit = false;
charBuffer[nChar++] = c;
if (nChar >= sizeof(charBuffer))
{
// runaway argument - avoid buffer overflow
t.setBad();
return *this;
}
if (is_.get(c))
{
hasDigit = isdigit(c);
if (!hasDigit && c != '+' && c != '-')
{
// not digit or [-+] - stop parsing
break;
}
}
else
{
break;
}
}
else
{
break;
}
asLabel = asLabel && isdigit(c);
charBuffer[nChar++] = c;
if (nChar >= sizeof(charBuffer))
@ -265,7 +215,6 @@ Foam::Istream& Foam::ISstream::read(token& t)
charBuffer[nChar] = '\0';
setState(is_.rdstate());
if (!is_.bad())
{
is_.putback(c);
@ -275,26 +224,30 @@ Foam::Istream& Foam::ISstream::read(token& t)
// a single '-' is punctuation
t = token::punctuationToken(token::SUBTRACT);
}
else if (!hasDigit)
{
// no digits is an error
t.setBad();
}
else if (floatState)
{
// scalar
t = scalar(atof(charBuffer));
}
else
{
// label
long lt = atol(charBuffer);
t = label(lt);
char *endptr;
// return as a scalar if doesn't fit in a label
if (t.labelToken() != lt)
if (asLabel)
{
t = scalar(atof(charBuffer));
long longval = strtol(charBuffer, &endptr, 10);
t = label(longval);
// return as a scalar if doesn't fit in a label
if (t.labelToken() != longval)
{
t = scalar(strtod(charBuffer, &endptr));
}
}
else
{
t = scalar(strtod(charBuffer, &endptr));
}
// nothing converted (bad format), or trailing junk
if (endptr == charBuffer || *endptr != '\0')
{
t.setBad();
}
}
}