research/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Integer read: use strtoimax rather than strtol and check explicitly for overflow of int32_t

Browse source
This commit is contained in:
Henry 2015-02-18 21:24:09 +00:00
parent 4db6925cee
commit 0ca9a1fb09
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/OpenFOAM/primitives/ints/int32/int32IO.C
View file

@ -28,6 +28,7 @@ License
#include "int32.H"
#include "IOstreams.H"
#include <inttypes.h>
#include <sstream>
#include <cerrno>
@ -87,9 +88,11 @@ bool Foam::read(const char* buf, int32_t& s)
{
char *endptr = NULL;
errno = 0;
long l = strtol(buf, &endptr, 10);
intmax_t l = strtoimax(buf, &endptr, 10);
s = int32_t(l);
return (*endptr == 0) && (errno == 0);
return
(*endptr == 0) && (errno == 0)
&& (l >= INT32_MIN) && (l <= INT32_MAX);
}

3
src/OpenFOAM/primitives/ints/int64/int64IO.C
View file

@ -28,6 +28,7 @@ License
#include "int64.H"
#include "IOstreams.H"
#include <inttypes.h>
#include <sstream>
#include <cerrno>
@ -87,7 +88,7 @@ bool Foam::read(const char* buf, int64_t& s)
{
char *endptr = NULL;
errno = 0;
long l = strtol(buf, &endptr, 10);
intmax_t l = strtoimax(buf, &endptr, 10);
s = int64_t(l);
return (*endptr == 0) && (errno == 0);
}