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: missing nullptr check in Function1/PatchFunction1 fallback logic

Browse Source
This commit is contained in:
Mark Olesen
2020-11-26 01:53:15 +01:00
parent b4eb214d56
commit 024d22cb64
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
View File

@ -107,14 +107,15 @@ Foam::Function1<Type>::New
else if (!coeffs) else if (!coeffs)
{ {
// Primitive entry. Coeffs dictionary is optional. // Primitive entry. Coeffs dictionary is optional.
// Use keyword() - not entryName - for compatibility lookup!
coeffs = const word& kw =
&dict.optionalSubDict
( (
eptr->keyword() + "Coeffs", eptr
keyType::LITERAL ? eptr->keyword() // Could be a compatibility lookup
: entryName
); );
coeffs = &dict.optionalSubDict(kw + "Coeffs", keyType::LITERAL);
} }

10
src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1New.C
View File

@ -129,12 +129,14 @@ Foam::PatchFunction1<Type>::New
// Primitive entry. Coeffs dictionary is optional. // Primitive entry. Coeffs dictionary is optional.
// Use keyword() - not entryName - for compatibility lookup! // Use keyword() - not entryName - for compatibility lookup!
coeffs = const word& kw =
&dict.optionalSubDict
( (
eptr->keyword() + "Coeffs", eptr
keyType::LITERAL ? eptr->keyword() // Could be a compatibility lookup
: entryName
); );
coeffs = &dict.optionalSubDict(kw + "Coeffs", keyType::LITERAL);
} }