Issue #18905: SIGSEGV when edit a sketch if a change sketch plane has been aborted...

diff --git a/src/GeomData/GeomData_Dir.cpp b/src/GeomData/GeomData_Dir.cpp
index 23c7ce1c4141c879640569ab080848dd5b811f93..07ed1e0d6fdaaf36dc042a152d5715dc97133703 100644 (file)
--- a/src/GeomData/GeomData_Dir.cpp
+++ b/src/GeomData/GeomData_Dir.cpp
@@ -82,3 +82,13 @@ void GeomData_Dir::reinit()
     myIsInitialized = true;
   }
 }
+
+bool GeomData_Dir::isInitialized()
+{
+  // Check once again the direction is initialized.
+  // Use case (bos #18905): draw a sketch, click "Change sketch plane", then abort it.
+  //                        myIsInitialized value is dropped to false, thus recheck.
+  if (!myIsInitialized)
+    myIsInitialized = myLab.FindAttribute(TDataStd_RealArray::GetID(), myCoords) == Standard_True;
+  return ModelAPI_Attribute::isInitialized();
+}

diff --git a/src/GeomData/GeomData_Dir.h b/src/GeomData/GeomData_Dir.h
index 1cc7f2ff92a0887c99e691ec294f50ceefdeb38c..bb4b52abb8d55ee3b4fc393f5b774e39544e7517 100644 (file)
--- a/src/GeomData/GeomData_Dir.h
+++ b/src/GeomData/GeomData_Dir.h
@@ -54,6 +54,9 @@ class GeomData_Dir : public GeomDataAPI_Dir
   /// Returns the coordinates of this attribute
   GEOMDATA_EXPORT virtual std::shared_ptr<GeomAPI_XYZ> xyz();
 
+  /// Returns \c ture if the direction is initialized
+  GEOMDATA_EXPORT virtual bool isInitialized();
+
  protected:
   /// Initializes attributes
   GEOMDATA_EXPORT GeomData_Dir(TDF_Label& theLabel);

diff --git a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp
index eb87e28847692f9538df90733cdd5118db86f5af..81b5018b76e2865f6d7e45c05d256e8978b8a015 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp
+++ b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp
@@ -260,7 +260,8 @@ gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape,
 
   // Compute shifting vector for a one symbol
   gp_Vec aShift = aVec1.Crossed(thePrs->plane()->normal()->impl<gp_Dir>());
-  aShift.Normalize();
+  if (aShift.SquareMagnitude() > Precision::SquareConfusion())
+    aShift.Normalize();
   aShift.Multiply(theStep * 0.8);
 
   // Shift the position coordinate according to position index