OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027941: Foundation Classes - NCollection_Vector::Iterator::offsetV() does not match NCollection_Vector::end()

Browse Source
This commit is contained in:
kgv 2016-10-07 18:49:34 +03:00 committed by apn
parent b88b0cf7fc
commit 0f5ea4b5f8
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/NCollection/NCollection_BaseVector.hxx
View File

@ -117,6 +117,13 @@ protected:
const Standard_Integer anIndex = myCurIndex + myICurBlock * myVector->myIncrement + theOffset;
myICurBlock = anIndex / myVector->myIncrement;
myCurIndex = anIndex % myVector->myIncrement;
if (myICurBlock > myIEndBlock)
{
// make sure that iterator produced by Offset()
// is equal to the end() iterator
--myICurBlock;
myCurIndex += myVector->myIncrement;
}
}
Standard_Integer differV (const Iterator& theOther) const

24
src/QANCollection/QANCollection_Stl.cxx
View File

@ -822,6 +822,30 @@ static Standard_Integer QANVectorStlIterator (Draw_Interpretor&, Standard_Intege
std::cout << "NCollection_Vector<double> Parallel: " <<
(aResult ? "SUCCESS" : "FAIL") << std::endl;
{
// Test case for a corner case described in a bug #0027941
// when vector length matches the increment.
// In this case NCollection_Vector::Iterator::Offset() produced mathematically equal
// but not the same iterator as returned by NCollection_Vector::end()
// so that their comparison was not equal.
// As result, std::stable_sort() crashed due to out-of-range access.
const int THE_INCREMENT = 256;
NCollection_Vector<int> aVector (THE_INCREMENT);
for (int anIter = 0; anIter < THE_INCREMENT; ++anIter)
{
aVector.Append (THE_INCREMENT - anIter);
}
NCollection_Vector<int>::iterator aBegin = aVector.begin();
NCollection_Vector<int>::iterator anEnd = aVector.end();
NCollection_Vector<int>::iterator aShift = aBegin + THE_INCREMENT;
aResult = (aShift == anEnd);
std::cout << "NCollection_Vector<int> Offset: " <<
(aResult ? "SUCCESS" : "FAIL") << std::endl;
std::stable_sort (aVector.begin(), aVector.end());
}
return 0;
}