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

BUG: FixedList/Pair writeEntry not re-readable (fixes #2351)

Browse Source 
- notably affects writing continuous data in binary. If generating a
  compound token (eg, List<label>), need to add in the size prefix
  otherwise it cannot actually be parsed properly as a List.

BUG: bad fallthrough for compound reading (FixedList)

- the branch was likely never reached, but would have attempted to
  read twice due to a bad fall-through condition.
This commit is contained in:
Mark Olesen
2022-02-14 10:43:00 +01:00
parent 2a25b356b9
commit 711e1142ed
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenFOAM/containers/Lists/FixedList/FixedList.H
View File

@ -37,8 +37,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef FixedList_H
#define FixedList_H
#ifndef Foam_FixedList_H
#define Foam_FixedList_H
#include "bool.H"
#include "label.H"

26
src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2021 OpenCFD Ltd.
Copyright (C) 2017-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -40,6 +40,11 @@ void Foam::FixedList<T, N>::writeEntry(Ostream& os) const
if (token::compound::isCompound(tag))
{
os << tag << token::SPACE;
if (os.format() == IOstream::BINARY && is_contiguous<T>::value)
{
// Need the size too so that List<Type>::readList parses correctly
os << static_cast<label>(N);
}
}
os << *this;
}
@ -155,7 +160,7 @@ Foam::Istream& Foam::FixedList<T, N>::readList
if (is.format() == IOstream::BINARY && is_contiguous<T>::value)
{
// Binary and contiguous
// Binary and contiguous. Length is non-zero
Detail::readContiguous<T>
(
@ -169,6 +174,7 @@ Foam::Istream& Foam::FixedList<T, N>::readList
"FixedList<T, N>::readList(Istream&) : "
"reading the binary block"
);
return is;
}
else
{
@ -183,23 +189,22 @@ Foam::Istream& Foam::FixedList<T, N>::readList
if (tok.isCompound())
{
// Compound: transfer contents
// - in practice probably never reach this branch
list = dynamicCast<token::Compound<List<T>>>
(
tok.transferCompoundToken(is)
);
return is;
}
else if (tok.isLabel())
{
const label len = tok.labelToken();
// List lengths must match
list.checkSize(len);
list.checkSize(tok.labelToken());
}
else if (!tok.isPunctuation())
{
FatalIOErrorInFunction(is)
<< "incorrect first token, expected <label> "
"or '(' or '{', found "
<< "incorrect first token, expected <label> or '(' , found "
<< tok.info() << nl
<< exit(FatalIOError);
}
@ -228,9 +233,10 @@ Foam::Istream& Foam::FixedList<T, N>::readList
else
{
// Uniform content (delimiter == token::BEGIN_BLOCK)
// - compatibility for v1812 and earlier (see issue #1160)
T val;
is >> val;
T elem;
is >> elem;
is.fatalCheck
(
@ -240,7 +246,7 @@ Foam::Istream& Foam::FixedList<T, N>::readList
for (unsigned i=0; i<N; ++i)
{
list[i] = val; // Copy the value
list[i] = elem; // Copy the value
}
}