From: mpv <mpv@opencascade.com>
Date: Fri, 27 May 2016 14:04:44 +0000 (+0300)
Subject: Fix of the crash on selection of edge of solid in the neutral point
X-Git-Tag: V_2.3.1~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b400c0d697b106e00aad1ea4d91a32de4e29b135;p=modules%2Fshaper.git

Fix of the crash on selection of edge of solid in the neutral point
---

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 88f8bc6cb..9994a1422 100755
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -43,6 +43,7 @@
 #include <TNaming_SameShapeIterator.hxx>
 #include <TNaming_Iterator.hxx>
 #include <TNaming_NamedShape.hxx>
+#include <TNaming_Tool.hxx>
 #include <TopExp_Explorer.hxx>
 
 #include <climits>
@@ -1292,6 +1293,8 @@ static Handle(TNaming_NamedShape) searchForOriginalShape(TopoDS_Shape theShape,
   while(!theShape.IsNull()) { // searching for the very initial shape that produces this one
     TopoDS_Shape aShape = theShape;
     theShape.Nullify();
+    if (!TNaming_Tool::HasLabel(aMain, aShape)) // to avoid crash of TNaming_SameShapeIterator if pure shape does not exists
+      break;
     for(TNaming_SameShapeIterator anIter(aShape, aMain); anIter.More(); anIter.Next()) {
       TDF_Label aNSLab = anIter.Label();
       Handle(TNaming_NamedShape) aNS;