From 7a88ce5b9869bfa20c6f34b51c2b9b68491ccfed Mon Sep 17 00:00:00 2001
From: asuraven <asuraven@opencascade.com>
Date: Mon, 2 Nov 2020 09:31:55 +0300
Subject: [PATCH] 0029108: Crash writing STEP file

* Wrapped a try / catch block on creating objects in TopoDSToStep_MakeStepFace::Init()
---
 src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx |  9 +++++++++
 tests/bugs/step/bug29108                       | 15 +++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/bugs/step/bug29108

diff --git a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
index e83bf18860..7cea157b53 100644
--- a/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
+++ b/src/TopoDSToStep/TopoDSToStep_MakeStepFace.cxx
@@ -180,6 +180,8 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace,
     return;
   }
   
+  try
+  {
   // -----------------
   // Translate Surface
   // -----------------
@@ -465,6 +467,13 @@ void TopoDSToStep_MakeStepFace::Init(const TopoDS_Face& aFace,
     myError = TopoDSToStep_NoWireMapped;
     done    = Standard_False;
   }
+  }
+  catch (Standard_Failure const& theFailure) 
+  {
+    FP->AddFail(errShape, theFailure.GetMessageString());
+    myError = TopoDSToStep_FaceOther;
+    done    = Standard_False;
+  }
 }
 
   
diff --git a/tests/bugs/step/bug29108 b/tests/bugs/step/bug29108
new file mode 100644
index 0000000000..4dcc4aa104
--- /dev/null
+++ b/tests/bugs/step/bug29108
@@ -0,0 +1,15 @@
+puts "=========="
+puts "0029108: Data Exchange - Crash writing STEP file"
+puts "=========="
+puts ""
+
+restore [locate_data_file bug29108.brep] part
+stepwrite a part $imagedir/bug229108_temp.stp
+dall
+stepread ${imagedir}/bug229108_temp.stp a *
+
+tpcompound result
+checkprops result -s 11833
+checkshape result
+checknbshapes result -vertex 251 -edge 380 -wire 155 -face 141 -shell 3 -solid 2 -compsolid 0 -compound 4 -shape 936
+