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

int??IO: handle overflow errors

Browse source
This commit is contained in:
Henry 2015-02-16 22:16:21 +00:00
parent 9617b8f559
commit cc6341a9d3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,6 +29,7 @@ License
#include "IOstreams.H"
#include <sstream>
#include <cerrno>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -85,9 +86,10 @@ int32_t Foam::readInt32(Istream& is)
bool Foam::read(const char* buf, int32_t& s)
{
char *endptr = NULL;
errno = 0;
long l = strtol(buf, &endptr, 10);
s = int32_t(l);
return (*endptr == 0);
return (*endptr == 0) && (errno == 0);
}

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

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,6 +29,7 @@ License
#include "IOstreams.H"
#include <sstream>
#include <cerrno>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -85,9 +86,10 @@ int64_t Foam::readInt64(Istream& is)
bool Foam::read(const char* buf, int64_t& s)
{
char *endptr = NULL;
errno = 0;
long l = strtol(buf, &endptr, 10);
s = int64_t(l);
return (*endptr == 0);
return (*endptr == 0) && (errno == 0);
}