From a605c12d81d1c257900c8c3872b500b539b63c48 Mon Sep 17 00:00:00 2001
From: Konstantin Leontev <Konstantin.LEONTEV@opencascade.com>
Date: Mon, 26 Aug 2024 16:04:30 +0100
Subject: [PATCH] [bos #42217][EDF 28921] Horseshoe with bodyfitting. Fixed
 wrong nodes num in open edges capping.

---
 src/StdMeshers/StdMeshers_Cartesian_3D_Hexahedron.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/StdMeshers/StdMeshers_Cartesian_3D_Hexahedron.cxx b/src/StdMeshers/StdMeshers_Cartesian_3D_Hexahedron.cxx
index 2fd65a3f3..716f923dd 100644
--- a/src/StdMeshers/StdMeshers_Cartesian_3D_Hexahedron.cxx
+++ b/src/StdMeshers/StdMeshers_Cartesian_3D_Hexahedron.cxx
@@ -3559,7 +3559,7 @@ bool Hexahedron::_volumeDef::capOpenEdgesPolygons(const std::vector<std::set<std
 
   // Consider a simple case where all the edges could form a closed polygon.
   // First edge will form the first and the last node in the vector.
-  const size_t freeNodesNum = freeEdges.size() * 2 - 1;
+  const size_t freeNodesNum = freeEdges.size();
   std::vector<int> nodes(freeNodesNum);
 
   auto findNode = [&](const std::pair<int, int>& edge, const int node, const int index) -> bool
@@ -3580,7 +3580,7 @@ bool Hexahedron::_volumeDef::capOpenEdgesPolygons(const std::vector<std::set<std
 
   size_t firstIdx = 0;
   size_t lastIdx = freeNodesNum - 1;
-  for (auto curEdge = freeEdges.begin(); curEdge != freeEdges.end(); ++curEdge)
+  for (auto curEdge = freeEdges.begin(); curEdge != freeEdges.end() && (lastIdx - firstIdx) > 1; ++curEdge)
   {
     // Store current nodes
     int firstNode = curEdge->first;
@@ -3652,7 +3652,7 @@ bool Hexahedron::_volumeDef::capOpenEdgesPolygons(const std::vector<std::set<std
   for (size_t i = 0; i < freeNodesNum; ++i)
   {
     auto nodeIt = std::find_if(_nodes.begin(), _nodes.end(),
-      [&](const _nodeDef& node) { return node.Node()->GetID() == nodes[i]; });
+      [&](const _nodeDef& node) { return node.Node() && node.Node()->GetID() == nodes[i]; });
 
     _nodes.push_back(*nodeIt);
   }
-- 
2.39.2