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

ENH: remove size limit when reading verbatim strings (issue #785)

Browse Source
This commit is contained in:
Mark Olesen
2018-04-03 08:16:20 +02:00
parent b854ce228e
commit c2f0864f68
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,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-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -471,8 +471,8 @@ Foam::Istream& Foam::ISstream::read(word& str)
<< buf << nl << endl; << buf << nl << endl;
} }
// Finalize // Finalize: content already validated, assign without additional checks.
str = buf; str.assign(buf, nChar);
putback(c); putback(c);
return *this; return *this;
@ -568,7 +568,7 @@ Foam::Istream& Foam::ISstream::read(string& str)
} }
// don't worry about a dangling backslash if string terminated prematurely // Don't worry about a dangling backslash if string terminated prematurely
buf[errLen] = buf[nChar] = '\0'; buf[errLen] = buf[nChar] = '\0';
FatalIOErrorInFunction(*this) FatalIOErrorInFunction(*this)
@ -711,6 +711,7 @@ Foam::Istream& Foam::ISstream::readVerbatim(string& str)
unsigned nChar = 0; unsigned nChar = 0;
char c; char c;
str.clear();
while (get(c)) while (get(c))
{ {
if (c == token::HASH) if (c == token::HASH)
@ -720,8 +721,7 @@ Foam::Istream& Foam::ISstream::readVerbatim(string& str)
if (nextC == token::END_BLOCK) if (nextC == token::END_BLOCK)
{ {
// The closing "#}" found // The closing "#}" found
buf[nChar] = '\0'; str.append(buf, nChar);
str = buf;
return *this; return *this;
} }
else else
@ -733,19 +733,13 @@ Foam::Istream& Foam::ISstream::readVerbatim(string& str)
buf[nChar++] = c; buf[nChar++] = c;
if (nChar == maxLen) if (nChar == maxLen)
{ {
buf[errLen] = '\0'; str.append(buf, nChar);
nChar = 0;
FatalIOErrorInFunction(*this)
<< "string \"" << buf << "...\"\n"
<< " is too long (max. " << maxLen << " characters)"
<< exit(FatalIOError);
return *this;
} }
} }
// don't worry about a dangling backslash if string terminated prematurely // Don't worry about a dangling backslash if string terminated prematurely
buf[errLen] = buf[nChar] = '\0'; buf[errLen] = buf[nChar] = '\0';
FatalIOErrorInFunction(*this) FatalIOErrorInFunction(*this)