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

PtrList: Check for EOF while reading to avoid run-on and infinite loop when reading list of dictionaries.

Browse Source 
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1538
This commit is contained in:
Henry
2015-02-18 08:12:01 +00:00
parent 7be1393fef
commit 3ec4a1d6df
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/OpenFOAM/containers/Lists/PtrList/PtrListIO.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) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -115,6 +115,17 @@ void Foam::PtrList<T>::read(Istream& is, const INew& inewt)
) )
{ {
is.putBack(lastToken); is.putBack(lastToken);
if (is.eof())
{
FatalIOErrorIn
(
"PtrList<T>::read(Istream&, const INew&)",
is
) << "Premature EOF after reading " << lastToken.info()
<< exit(FatalIOError);
}
sllPtrs.append(inewt(is).ptr()); sllPtrs.append(inewt(is).ptr());
is >> lastToken; is >> lastToken;
} }