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

int??IO: handle overflow errors

Browse Source
This commit is contained in:
Henry
2015-02-16 22:16:21 +00:00
parent 3673b65b61
commit c3a9a6c10f
2 changed files with 8 additions and 4 deletions
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,6 +29,7 @@ License
#include "IOstreams.H" #include "IOstreams.H"
#include <sstream> #include <sstream>
#include <cerrno>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -85,9 +86,10 @@ int32_t Foam::readInt32(Istream& is)
bool Foam::read(const char* buf, int32_t& s) bool Foam::read(const char* buf, int32_t& s)
{ {
char *endptr = NULL; char *endptr = NULL;
errno = 0;
long l = strtol(buf, &endptr, 10); long l = strtol(buf, &endptr, 10);
s = int32_t(l); 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -29,6 +29,7 @@ License
#include "IOstreams.H" #include "IOstreams.H"
#include <sstream> #include <sstream>
#include <cerrno>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -85,9 +86,10 @@ int64_t Foam::readInt64(Istream& is)
bool Foam::read(const char* buf, int64_t& s) bool Foam::read(const char* buf, int64_t& s)
{ {
char *endptr = NULL; char *endptr = NULL;
errno = 0;
long l = strtol(buf, &endptr, 10); long l = strtol(buf, &endptr, 10);
s = int64_t(l); s = int64_t(l);
return (*endptr == 0); return (*endptr == 0) && (errno == 0);
} }