exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix: operator= for PtrList needs to check if source pointers are set

Browse source
This commit is contained in:
Hrvoje Jasak 2018-10-24 16:51:48 +01:00
parent 2a04913eaf
commit f60da6ec49
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/foam/containers/Lists/PtrList/PtrList.C
View file

@ -263,26 +263,35 @@ Foam::PtrList<T>& Foam::PtrList<T>::operator=(const PtrList<T>& a)
<< abort(FatalError);
}
if (size() == 0)
if (this->size() == 0)
{
setSize(a.size());
this->setSize(a.size());
forAll(*this, i)
{
ptrs_[i] = (a[i]).clone().ptr();
// Bugfix: only copy elements of a that have been set.
// HJ, 24/Oct/2018
if (a.set(i))
{
this->ptrs_[i] = (a[i]).clone().ptr();
}
}
}
else if (a.size() == size())
else if (a.size() == this->size())
{
forAll(*this, i)
{
(*this)[i] = a[i];
if (a.set(i))
{
(*this)[i] = a[i];
}
}
}
else
{
FatalErrorIn("PtrList::operator=(const PtrList<T>&)")
<< "bad size: " << a.size()
<< " for type " << typeid(T).name()
<< abort(FatalError);
}