From afc0cb8741279cf6bb4d388b96a8add84af3186a Mon Sep 17 00:00:00 2001
From: azv <azv@opencascade.com>
Date: Tue, 12 Jul 2016 10:20:24 +0300
Subject: [PATCH] Fix couple of crashes in SketchSolver plugin

---
 src/SketchSolver/SketchSolver_ConstraintMulti.cpp | 3 ++-
 src/SketchSolver/SketchSolver_Manager.cpp         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/SketchSolver/SketchSolver_ConstraintMulti.cpp b/src/SketchSolver/SketchSolver_ConstraintMulti.cpp
index 952fecafd..f89f31421 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMulti.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMulti.cpp
@@ -43,7 +43,8 @@ void SketchSolver_ConstraintMulti::getEntities(std::list<EntityWrapperPtr>& theE
     if (!aFeature)
       continue;
 
-    myStorage->update(aFeature);
+    if (!myStorage->update(aFeature)) // the entity is not created, so it is a copy in "multi" constraint, force its creation
+      myStorage->update(aFeature, myGroupID, true);
     theEntities.push_back(myStorage->entity(aFeature));
     myFeatures.insert(aFeature);
     for (int i = 0; i < myNumberOfCopies && anObjIt != anObjectList.end(); ++i, ++anObjIt) {
diff --git a/src/SketchSolver/SketchSolver_Manager.cpp b/src/SketchSolver/SketchSolver_Manager.cpp
index c83f544f2..4748424f8 100644
--- a/src/SketchSolver/SketchSolver_Manager.cpp
+++ b/src/SketchSolver/SketchSolver_Manager.cpp
@@ -526,7 +526,7 @@ static void collectPointsAndCopies(FeaturePtr theConstraint, std::list<std::set<
       for (; anIt != anAttrList.end(); ++anIt) {
         aPoints.clear();
         aCopyIt = anObjIt;
-        for (int i = 0; i < aNbCopies; ++i, ++aCopyIt) {
+        for (int i = 0; i < aNbCopies && aCopyIt != aFullList.end(); ++i, ++aCopyIt) {
           FeaturePtr aFeature = ModelAPI_Feature::feature(*aCopyIt);
           aPoints.insert(aFeature->attribute(*anIt));
         }
-- 
2.39.2