Set of fixes to avoid crashes on invalid document from issue #2147 opening.

[modules/shaper.git] / src / Model / Model_AttributeIntArray.cpp

diff --git a/src/Model/Model_AttributeIntArray.cpp b/src/Model/Model_AttributeIntArray.cpp
index 2d061d411472c02ef5079f461d054c3e46f34a0a..15e84ece98aadfd62ea0d9ceafc44db141318904 100644 (file)
--- a/src/Model/Model_AttributeIntArray.cpp
+++ b/src/Model/Model_AttributeIntArray.cpp
@@ -20,6 +20,11 @@
 
 int Model_AttributeIntArray::size()
 {
+  if (myArray.IsNull() || !myArray->IsValid()) {
+    // this could be on undo and then redo creation of the attribute
+    // in result creation it may be uninitialized
+    myIsInitialized = myLab.FindAttribute(TDataStd_IntegerArray::GetID(), myArray) == Standard_True;
+  }
   // checking the validity because attribute (as a field) may be presented,
   // but without label: it is undoed
   return (myArray.IsNull() || !myArray->IsValid()) ? 0 : myArray->Length();
@@ -29,7 +34,7 @@ void Model_AttributeIntArray::setSize(const int theSize)
 {
   if (myArray.IsNull() || !myArray->IsValid()) { // create array if it is not done yet
     if (theSize != 0) { // if size is zero, nothing to do (null array means there is no array)
-      myArray = TDataStd_IntegerArray::Set(myLab, 0, theSize);
+      myArray = TDataStd_IntegerArray::Set(myLab, 0, theSize - 1);
       owner()->data()->sendAttributeUpdated(this);
     }
   } else { // reset the old array
@@ -66,7 +71,12 @@ int Model_AttributeIntArray::value(const int theIndex)
 Model_AttributeIntArray::Model_AttributeIntArray(TDF_Label& theLabel)
 {
   myLab = theLabel;
+  reinit();
+}
+
+void Model_AttributeIntArray::reinit()
+{
   // check the attribute could be already presented in this doc (after load document)
-  myIsInitialized = 
+  myIsInitialized =
     myLab.FindAttribute(TDataStd_IntegerArray::GetID(), myArray) == Standard_True;
 }