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

0026448: Method Prepend() of sequence breaks it if argument is empty sequence

Browse Source 
Check for empty input sequence added in methods Append() and Prepend() of TCollection and NCollection sequences.

Test bugs fclasses bug26448 added
This commit is contained in:
abv 2015-07-16 00:34:02 +03:00
parent adc33035ae
commit fac9298e2b
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NCollection/NCollection_BaseSequence.cxx
View File

@ -68,6 +68,8 @@ void NCollection_BaseSequence::PAppend (NCollection_SeqNode * theItem)
void NCollection_BaseSequence::PAppend(NCollection_BaseSequence& Other) void NCollection_BaseSequence::PAppend(NCollection_BaseSequence& Other)
{ {
if (Other.mySize == 0)
return;
if (mySize == 0) { if (mySize == 0) {
mySize = Other.mySize; mySize = Other.mySize;
myFirstItem = Other.myFirstItem; myFirstItem = Other.myFirstItem;
@ -113,6 +115,8 @@ void NCollection_BaseSequence::PPrepend (NCollection_SeqNode * theItem)
void NCollection_BaseSequence::PPrepend (NCollection_BaseSequence& Other) void NCollection_BaseSequence::PPrepend (NCollection_BaseSequence& Other)
{ {
if (Other.mySize == 0)
return;
if (mySize == 0) { if (mySize == 0) {
mySize = Other.mySize; mySize = Other.mySize;
myFirstItem = Other.myFirstItem; myFirstItem = Other.myFirstItem;

17
src/QABugs/QABugs_19.cxx
View File

@ -3663,6 +3663,22 @@ static Standard_Integer OCC24923(
return 0; return 0;
} }
static Standard_Integer OCC26448 (Draw_Interpretor& theDI, Standard_Integer, const char **)
{
TColStd_SequenceOfReal aSeq1, aSeq2;
aSeq1.Append(11.);
aSeq1.Prepend (aSeq2);
theDI << "TCollection: 11 -> " << aSeq1.First() << "\n";
NCollection_Sequence<Standard_Real> nSeq1, nSeq2;
nSeq1.Append(11.);
nSeq1.Prepend (nSeq2);
theDI << "NCollection: 11 -> " << nSeq1.First() << "\n";
theDI << "OK";
return 0;
}
void QABugs::Commands_19(Draw_Interpretor& theCommands) { void QABugs::Commands_19(Draw_Interpretor& theCommands) {
const char *group = "QABugs"; const char *group = "QABugs";
@ -3734,5 +3750,6 @@ void QABugs::Commands_19(Draw_Interpretor& theCommands) {
theCommands.Add ("OCC24923", "OCC24923", __FILE__, OCC24923, group); theCommands.Add ("OCC24923", "OCC24923", __FILE__, OCC24923, group);
theCommands.Add ("OCC26139", "OCC26139 [-boxsize value] [-boxgrid value] [-compgrid value]", __FILE__, OCC26139, group); theCommands.Add ("OCC26139", "OCC26139 [-boxsize value] [-boxgrid value] [-compgrid value]", __FILE__, OCC26139, group);
theCommands.Add ("OCC26284", "OCC26284", __FILE__, OCC26284, group); theCommands.Add ("OCC26284", "OCC26284", __FILE__, OCC26284, group);
theCommands.Add ("OCC26448", "OCC26448: check method Prepend() of sequence", __FILE__, OCC26448, group);
return; return;
} }

4
src/TCollection/TCollection_BaseSequence.cxx
View File

@ -67,6 +67,8 @@ void TCollection_BaseSequence::PAppend(const Standard_Address newnode)
// --------------------------------------------------- // ---------------------------------------------------
void TCollection_BaseSequence::PAppend(TCollection_BaseSequence& Other) void TCollection_BaseSequence::PAppend(TCollection_BaseSequence& Other)
{ {
if (Other.Size == 0)
return;
if (Size == 0) { if (Size == 0) {
Size = Other.Size; Size = Other.Size;
FirstItem = Other.FirstItem; FirstItem = Other.FirstItem;
@ -104,6 +106,8 @@ void TCollection_BaseSequence::PPrepend(const Standard_Address newnode)
void TCollection_BaseSequence::PPrepend(TCollection_BaseSequence& Other) void TCollection_BaseSequence::PPrepend(TCollection_BaseSequence& Other)
{ {
if (Other.Size == 0)
return;
if (Size == 0) { if (Size == 0) {
Size = Other.Size; Size = Other.Size;
FirstItem = Other.FirstItem; FirstItem = Other.FirstItem;

10
tests/bugs/fclasses/bug26448 Normal file
View File

@ -0,0 +1,10 @@
puts "============"
puts "OCC26448"
puts "============"
puts ""
#######################################################################
# Method Prepend() of sequence breaks it if argument is empty sequence
#######################################################################
pload QAcommands
OCC26448