From 576f37610875c0de33b6113288504bfa064a3821 Mon Sep 17 00:00:00 2001
From: astromko <astromko@opencascade.com>
Date: Thu, 8 Feb 2024 17:02:45 +0000
Subject: [PATCH] 0031601: Modeling Algorithms - BRepOffset_Tool Segmentation
 Fault

Added protection against null pointer dereferencing.
Modified BRepOffset_MakeOffset::MakeThickSolid method.
Fixed the problem with negative volume values.
Fixed several unit tests and added a new one.
---
 src/BRepOffset/BRepOffset_Inter3d.cxx    |  3 +--
 src/BRepOffset/BRepOffset_MakeOffset.cxx |  6 +++++-
 src/BRepOffset/BRepOffset_Tool.cxx       |  9 ++++++---
 tests/bugs/modalg_2/bug427_6             |  5 -----
 tests/bugs/modalg_2/bug5805_18           |  8 ++------
 tests/bugs/modalg_2/bug5805_19           |  8 ++------
 tests/bugs/modalg_2/bug5805_20           |  8 ++------
 tests/bugs/modalg_2/bug5805_42           |  4 +---
 tests/bugs/modalg_2/bug5805_43           |  5 +----
 tests/bugs/modalg_2/bug5805_44           |  6 +-----
 tests/bugs/modalg_7/bug25395_1           |  2 --
 tests/bugs/modalg_7/bug25939             |  2 --
 tests/bugs/modalg_7/bug31845_f           |  2 --
 tests/bugs/modalg_7/bug31845_i           |  2 --
 tests/bugs/modalg_8/bug31601             | 15 +++++++++++++++
 tests/offset/compshape/A1                |  5 +----
 tests/offset/compshape/A4                |  1 -
 tests/offset/faces_type_i/A9             |  8 ++++----
 tests/offset/faces_type_i/B4             |  6 +-----
 tests/offset/faces_type_i/B5             |  6 +-----
 tests/offset/faces_type_i/B6             |  7 +++----
 tests/offset/faces_type_i/C1             |  7 +++----
 tests/offset/faces_type_i/C2             |  6 +-----
 tests/offset/faces_type_i/C5             |  6 ++----
 tests/offset/faces_type_i/C9             |  3 +--
 tests/offset/faces_type_i/D1             |  6 +-----
 tests/offset/faces_type_i/E7             |  9 +++------
 tests/offset/faces_type_i/E8             |  8 +-------
 tests/offset/faces_type_i/E9             |  8 +-------
 tests/offset/faces_type_i/F1             |  6 +-----
 tests/offset/faces_type_i/F2             |  9 +++------
 tests/offset/faces_type_i/F3             |  8 +-------
 tests/offset/faces_type_i/F4             |  8 +-------
 tests/offset/faces_type_i/F5             |  8 +-------
 tests/offset/faces_type_i/I5             |  6 +-----
 tests/offset/faces_type_i/J5             |  6 +-----
 tests/offset/faces_type_i/K6             |  6 +-----
 tests/offset/faces_type_i/M6             |  6 +-----
 tests/offset/faces_type_i/M8             |  6 +-----
 tests/offset/faces_type_i/N1             |  9 +++------
 tests/offset/shape/A1                    |  4 +---
 41 files changed, 75 insertions(+), 178 deletions(-)
 create mode 100644 tests/bugs/modalg_8/bug31601

diff --git a/src/BRepOffset/BRepOffset_Inter3d.cxx b/src/BRepOffset/BRepOffset_Inter3d.cxx
index 00804755ec..27879e8f28 100644
--- a/src/BRepOffset/BRepOffset_Inter3d.cxx
+++ b/src/BRepOffset/BRepOffset_Inter3d.cxx
@@ -1292,11 +1292,10 @@ void BRepOffset_Inter3d::ContextIntByArc(const TopTools_IndexedMapOfShape& Conte
             for ( ;exp2.More(); exp2.Next()) {
               LOE.Append(exp2.Current());
             }
-            BRepOffset_Tool::TryProject(CF,OF1,LOE,LInt1,LInt2,mySide,myTol);
             //-------------------------------------------------------
             // If no trace try intersection.
             //-------------------------------------------------------
-            if (LInt1.IsEmpty()) {
+            if (!BRepOffset_Tool::TryProject(CF, OF1, LOE, LInt1, LInt2, mySide, myTol) || LInt1.IsEmpty()) {
               BRepOffset_Tool::Inter3D (CF,OF1,LInt1,LInt2,mySide,NullEdge,NullFace,NullFace);
             }
             Store (CF,OF1,LInt1,LInt2);
diff --git a/src/BRepOffset/BRepOffset_MakeOffset.cxx b/src/BRepOffset/BRepOffset_MakeOffset.cxx
index df326ec655..da3e404dbd 100644
--- a/src/BRepOffset/BRepOffset_MakeOffset.cxx
+++ b/src/BRepOffset/BRepOffset_MakeOffset.cxx
@@ -1175,12 +1175,16 @@ void BRepOffset_MakeOffset::MakeThickSolid(const Message_ProgressRange& theRange
     {
       NbOF++;
     }
-    if (NbOF <= NbF)
+    if (NbOF < NbF)
     {
       myDone = Standard_False;
       myError = BRepOffset_UnknownError;
       return;
     }
+    if (NbOF == NbF)
+    {
+      myOffset = 0;
+    }
   }
 
   if (myOffset > 0 ) myOffsetShape.Reverse();
diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx
index 45ce024999..6c08941e18 100644
--- a/src/BRepOffset/BRepOffset_Tool.cxx
+++ b/src/BRepOffset/BRepOffset_Tool.cxx
@@ -1881,6 +1881,10 @@ Standard_Boolean BRepOffset_Tool::TryProject
     if (C.IsNull()) {
       BRepLib::BuildCurve3d(CurE,BRep_Tool::Tolerance(CurE));
       C  = BRep_Tool::Curve(CurE,L,f,l);
+      if (C.IsNull())
+      {
+        return Standard_False;
+      }
     }
     C = new Geom_TrimmedCurve(C,f,l);
     if ( !L.IsIdentity()) C->Transform(L);
@@ -3519,9 +3523,8 @@ void BRepOffset_Tool::ExtentFace (const TopoDS_Face&            F,
       if (ToBuild.IsBound(E)) {
 	TopTools_ListOfShape LOE;
 	LOE.Append(E);
-	BRepOffset_Tool::TryProject (TopoDS::Face(ToBuild(E)),
-				     EF,LOE,LInt2,LInt1,Side,TolConf);
-	if (!LInt1.IsEmpty()) 
+	if (BRepOffset_Tool::TryProject(TopoDS::Face(ToBuild(E)), EF, LOE, LInt2, LInt1, Side, TolConf)
+        && !LInt1.IsEmpty())
 	  ToBuild.UnBind(E);
       }
     }
diff --git a/tests/bugs/modalg_2/bug427_6 b/tests/bugs/modalg_2/bug427_6
index 8c01765b1f..e56406dc0b 100755
--- a/tests/bugs/modalg_2/bug427_6
+++ b/tests/bugs/modalg_2/bug427_6
@@ -1,8 +1,3 @@
-puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23068 ALL: result is not a topological shape!!!"
-puts "TODO OCC23068 ALL: Error: The command cannot be built"
-puts "TODO OCC23068 ALL: TEST INCOMPLETE"
-
 puts "========================"
 puts " OCC427 "
 puts "(case 6)"
diff --git a/tests/bugs/modalg_2/bug5805_18 b/tests/bugs/modalg_2/bug5805_18
index d6663828e9..a9b3d8da97 100755
--- a/tests/bugs/modalg_2/bug5805_18
+++ b/tests/bugs/modalg_2/bug5805_18
@@ -1,8 +1,4 @@
-puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
-puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
+puts "TODO OCC25925 ALL: Error : The area of result shape is"
 
 puts "============"
 puts "OCC5805"
@@ -52,6 +48,6 @@ if {$index == -1} {
   
 }
 
-checknbshapes result -t -wire 5 -face 5 -shell 2 -solid 1
+checknbshapes result -t -wire 3 -face 3 -shell 1 -solid 1
 
 checkview -display result -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/bugs/modalg_2/bug5805_19 b/tests/bugs/modalg_2/bug5805_19
index 5326ae6bd5..b2a91e220f 100755
--- a/tests/bugs/modalg_2/bug5805_19
+++ b/tests/bugs/modalg_2/bug5805_19
@@ -1,8 +1,4 @@
-puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Error : The area of result shape is"
 
 puts "============"
 puts "OCC5805"
@@ -53,6 +49,6 @@ if {$index == -1} {
   
 }
 
-checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
+checknbshapes result -vertex 1 -edge 2 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 11
 
 checkview -display result -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/bugs/modalg_2/bug5805_20 b/tests/bugs/modalg_2/bug5805_20
index 6179d7973b..1c1023b83a 100755
--- a/tests/bugs/modalg_2/bug5805_20
+++ b/tests/bugs/modalg_2/bug5805_20
@@ -1,8 +1,4 @@
-puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Error : The area of result shape is"
 
 puts "============"
 puts "OCC5805"
@@ -53,6 +49,6 @@ if {$index == -1} {
   
 }
 
-checknbshapes result -vertex 2 -edge 3 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 13
+checknbshapes result -vertex 1 -edge 2 -wire 3 -face 3 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 11
 
 checkview -display result -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/bugs/modalg_2/bug5805_42 b/tests/bugs/modalg_2/bug5805_42
index c79971d3fe..f4f8c436e2 100755
--- a/tests/bugs/modalg_2/bug5805_42
+++ b/tests/bugs/modalg_2/bug5805_42
@@ -1,6 +1,4 @@
-puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
+puts "TODO OCC25925 ALL: Error : The area of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_43 b/tests/bugs/modalg_2/bug5805_43
index 521bc02d03..5960b434ac 100755
--- a/tests/bugs/modalg_2/bug5805_43
+++ b/tests/bugs/modalg_2/bug5805_43
@@ -1,7 +1,4 @@
-puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Error : The area of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_44 b/tests/bugs/modalg_2/bug5805_44
index aefc2dc4bb..6fa5700dc6 100755
--- a/tests/bugs/modalg_2/bug5805_44
+++ b/tests/bugs/modalg_2/bug5805_44
@@ -1,8 +1,4 @@
-puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC25925 ALL: Tcl Exception: Error : command \\\"nbshapes result\\\" gives an empty result"
-puts "TODO OCC25925 ALL: Error: The command cannot be built"
-puts "TODO OCC25925 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Error : The area of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_7/bug25395_1 b/tests/bugs/modalg_7/bug25395_1
index 7e3ccccf02..3b010ec018 100644
--- a/tests/bugs/modalg_7/bug25395_1
+++ b/tests/bugs/modalg_7/bug25395_1
@@ -1,5 +1,3 @@
-puts "TODO OCC25395 ALL: ERROR. offsetperform operation not done."
-
 puts "========"
 puts "OCC25395"
 puts "========"
diff --git a/tests/bugs/modalg_7/bug25939 b/tests/bugs/modalg_7/bug25939
index e32651d9ce..a85948c4da 100755
--- a/tests/bugs/modalg_7/bug25939
+++ b/tests/bugs/modalg_7/bug25939
@@ -1,5 +1,3 @@
-puts "TODO OCC25939 ALL: An exception was caught"
-
 puts "============"
 puts "0025939: S I G S E G V in MakeThickSolid"
 puts "============"
diff --git a/tests/bugs/modalg_7/bug31845_f b/tests/bugs/modalg_7/bug31845_f
index 078287b95f..bda568ea45 100644
--- a/tests/bugs/modalg_7/bug31845_f
+++ b/tests/bugs/modalg_7/bug31845_f
@@ -1,5 +1,3 @@
-puts "TODO OCC31845 All: ERROR. offsetperform operation not done."
-
 puts "============================================"
 puts "OCC31845: BRepOffsetAPI_MakeThickSolid fails"
 puts "============================================"
diff --git a/tests/bugs/modalg_7/bug31845_i b/tests/bugs/modalg_7/bug31845_i
index b8ccb75300..f115ba6a47 100644
--- a/tests/bugs/modalg_7/bug31845_i
+++ b/tests/bugs/modalg_7/bug31845_i
@@ -1,5 +1,3 @@
-puts "TODO OCC31845 All: ERROR. offsetperform operation not done."
-
 puts "============================================"
 puts "OCC31845: BRepOffsetAPI_MakeThickSolid fails"
 puts "============================================"
diff --git a/tests/bugs/modalg_8/bug31601 b/tests/bugs/modalg_8/bug31601
new file mode 100644
index 0000000000..b44f7c7bbe
--- /dev/null
+++ b/tests/bugs/modalg_8/bug31601
@@ -0,0 +1,15 @@
+puts "================================================================="
+puts "0031601: Modeling Algorithms - BRepOffset_Tool Segmentation Fault"
+puts "================================================================="
+puts ""
+
+pload MODELING
+box b 50 50 10
+explode b E
+compound b_1 b_2 b_3 b_4 b_5 b_6 b_7 b_8 b_9 b_10 b_11 b_12 c
+fillet s b 4 c
+explode s F
+offsetparameter 1.e-7 c a
+offsetload s 1 s_11
+offsetperform r
+checkview -display r -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/offset/compshape/A1 b/tests/offset/compshape/A1
index 50e789cc3c..16e57ebc06 100644
--- a/tests/offset/compshape/A1
+++ b/tests/offset/compshape/A1
@@ -1,6 +1,3 @@
-puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23068 ALL: Error : The volume of result shape "
-
 ## ======================================
 ## Grid    : CCV002
 ## Test    : A1
@@ -12,4 +9,4 @@ explode s F
 offsetcompshape result s -10 s_1
 
 #real volume of result shape is unknown yet
-checkprops result -v 0
+checkprops result -v 1.01e+06
diff --git a/tests/offset/compshape/A4 b/tests/offset/compshape/A4
index 6811c03cbd..5e360f307a 100755
--- a/tests/offset/compshape/A4
+++ b/tests/offset/compshape/A4
@@ -4,7 +4,6 @@
 ## Comment : From CV tests serie page 60
 ## ======================================
 
-puts "TODO OCC26556 ALL: ERROR. offsetperform operation not done."
 restore [locate_data_file CCV_2_d1_gsw.rle] s
 explode s F
 catch {offsetcompshape result s -2 s_17}
diff --git a/tests/offset/faces_type_i/A9 b/tests/offset/faces_type_i/A9
index 47052f242f..d67a474eeb 100644
--- a/tests/offset/faces_type_i/A9
+++ b/tests/offset/faces_type_i/A9
@@ -1,9 +1,9 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
+puts "TODO CR23530 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The area of face "
+
 pcone s 5 0 12 90
 trotate s 0 0 0 0 0 1 90
 
 OFFSETSHAPE 1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 78.53988 
diff --git a/tests/offset/faces_type_i/B4 b/tests/offset/faces_type_i/B4
index b4b88a4775..17086e8e62 100644
--- a/tests/offset/faces_type_i/B4
+++ b/tests/offset/faces_type_i/B4
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 pcone s 5 0 12 270
 
 OFFSETSHAPE -1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 235.619
diff --git a/tests/offset/faces_type_i/B5 b/tests/offset/faces_type_i/B5
index f8a222a15c..1d2f7982ed 100644
--- a/tests/offset/faces_type_i/B5
+++ b/tests/offset/faces_type_i/B5
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 pcone s 5 0 12 270
 
 OFFSETSHAPE 1 {s_3 s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 235.619
diff --git a/tests/offset/faces_type_i/B6 b/tests/offset/faces_type_i/B6
index e11d3e9845..642047eb2b 100644
--- a/tests/offset/faces_type_i/B6
+++ b/tests/offset/faces_type_i/B6
@@ -1,10 +1,9 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
+puts "TODO OCC23068 ALL: Error : The area of face "
+puts "TODO CR23530 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
 psphere s 15 -90 60 90
 trotate s 0 0 0 0 0 1 90
 
 OFFSETSHAPE 1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 3488.84
diff --git a/tests/offset/faces_type_i/C1 b/tests/offset/faces_type_i/C1
index b1bd5fb38e..fd791a1c5a 100644
--- a/tests/offset/faces_type_i/C1
+++ b/tests/offset/faces_type_i/C1
@@ -1,9 +1,8 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
+puts "TODO OCC23068 ALL: Error : The area of face "
+puts "TODO CR23530 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
 psphere s 15 -90 60 270
 
 OFFSETSHAPE 1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 10466.5
diff --git a/tests/offset/faces_type_i/C2 b/tests/offset/faces_type_i/C2
index f4ec64f17d..04bb3bab57 100644
--- a/tests/offset/faces_type_i/C2
+++ b/tests/offset/faces_type_i/C2
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 psphere s 15 -90 60 270
 
 OFFSETSHAPE -1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 10466.5
diff --git a/tests/offset/faces_type_i/C5 b/tests/offset/faces_type_i/C5
index 957568b246..740907eab5 100644
--- a/tests/offset/faces_type_i/C5
+++ b/tests/offset/faces_type_i/C5
@@ -1,10 +1,8 @@
-puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO OCC23068 ALL: Error: The command cannot be built"
+puts "TODO OCC23068 ALL: Error : The area of face "
 
 psphere s 15 90
 trotate s 0 0 0 0 0 1 90
 
 OFFSETSHAPE 1 {s_3} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 3534.29
diff --git a/tests/offset/faces_type_i/C9 b/tests/offset/faces_type_i/C9
index 6a79959219..6c3ad81700 100644
--- a/tests/offset/faces_type_i/C9
+++ b/tests/offset/faces_type_i/C9
@@ -1,5 +1,4 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error : The offset cannot be built."
+puts "TODO OCC23068 ALL: Error : The area of face "
 
 psphere s 15 270
 
diff --git a/tests/offset/faces_type_i/D1 b/tests/offset/faces_type_i/D1
index 1445bfb776..91dc190738 100644
--- a/tests/offset/faces_type_i/D1
+++ b/tests/offset/faces_type_i/D1
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 psphere s 15 270
 
 OFFSETSHAPE -1 {s_2} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 10602.9
diff --git a/tests/offset/faces_type_i/E7 b/tests/offset/faces_type_i/E7
index 0be2810d3a..d169a86744 100755
--- a/tests/offset/faces_type_i/E7
+++ b/tests/offset/faces_type_i/E7
@@ -1,8 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
+puts "TODO CR23530 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The area of face "
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
@@ -14,4 +11,4 @@ revol s w 0 0 0 0 0 1 90
 
 OFFSETSHAPE 1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 4385.14
diff --git a/tests/offset/faces_type_i/E8 b/tests/offset/faces_type_i/E8
index a11a388ca7..4479cc830d 100644
--- a/tests/offset/faces_type_i/E8
+++ b/tests/offset/faces_type_i/E8
@@ -1,9 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90
@@ -14,4 +8,4 @@ revol s w 0 0 0 0 0 1 90
 
 OFFSETSHAPE -1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 4385.14
diff --git a/tests/offset/faces_type_i/E9 b/tests/offset/faces_type_i/E9
index ec5307350f..03318b6f26 100644
--- a/tests/offset/faces_type_i/E9
+++ b/tests/offset/faces_type_i/E9
@@ -1,9 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90
@@ -14,4 +8,4 @@ revol s w 0 0 0 0 0 1 90
 
 OFFSETSHAPE 1 {s_4 s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 4385.14
diff --git a/tests/offset/faces_type_i/F1 b/tests/offset/faces_type_i/F1
index da8b77081a..5d9163ded1 100644
--- a/tests/offset/faces_type_i/F1
+++ b/tests/offset/faces_type_i/F1
@@ -1,7 +1,3 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90
@@ -12,4 +8,4 @@ revol s w 0 0 0 0 0 1 90
 
 OFFSETSHAPE -1 {s_4 s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 4385.14
diff --git a/tests/offset/faces_type_i/F2 b/tests/offset/faces_type_i/F2
index 0d23b75d5f..22c7abe87c 100755
--- a/tests/offset/faces_type_i/F2
+++ b/tests/offset/faces_type_i/F2
@@ -1,8 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
+puts "TODO CR23530 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The area of face "
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
@@ -14,4 +11,4 @@ revol s w 0 0 0 0 0 1 270
 
 OFFSETSHAPE 1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 13155.2
diff --git a/tests/offset/faces_type_i/F3 b/tests/offset/faces_type_i/F3
index 6243913d5b..fdc37e343f 100644
--- a/tests/offset/faces_type_i/F3
+++ b/tests/offset/faces_type_i/F3
@@ -1,9 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 cpulimit 400
 
 ellipse w1 0 0 0 15 10
@@ -16,4 +10,4 @@ revol s w 0 0 0 0 0 1 270
 
 OFFSETSHAPE -1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 13155.2
diff --git a/tests/offset/faces_type_i/F4 b/tests/offset/faces_type_i/F4
index 8fcbf2bd36..40400eccaf 100644
--- a/tests/offset/faces_type_i/F4
+++ b/tests/offset/faces_type_i/F4
@@ -1,9 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90
@@ -14,4 +8,4 @@ revol s w 0 0 0 0 0 1 270
 
 OFFSETSHAPE 1 {s_4 s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 13155.2
diff --git a/tests/offset/faces_type_i/F5 b/tests/offset/faces_type_i/F5
index 8441586e46..9a14c5cf54 100644
--- a/tests/offset/faces_type_i/F5
+++ b/tests/offset/faces_type_i/F5
@@ -1,9 +1,3 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 # 17.01.2010
 cpulimit 600
 # 17.01.2010
@@ -18,4 +12,4 @@ revol s w 0 0 0 0 0 1 270
 
 OFFSETSHAPE -1 {s_4 s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 13155.2
diff --git a/tests/offset/faces_type_i/I5 b/tests/offset/faces_type_i/I5
index 80b53c4b42..e44979e7da 100644
--- a/tests/offset/faces_type_i/I5
+++ b/tests/offset/faces_type_i/I5
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 pcylinder s 5 10 270
 
 OFFSETSHAPE -1 {s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 589.049
diff --git a/tests/offset/faces_type_i/J5 b/tests/offset/faces_type_i/J5
index caf11e0129..84d09651d6 100644
--- a/tests/offset/faces_type_i/J5
+++ b/tests/offset/faces_type_i/J5
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 pcone s 9 4 15 270
 
 OFFSETSHAPE -1 {s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 1566.87
diff --git a/tests/offset/faces_type_i/K6 b/tests/offset/faces_type_i/K6
index 9b9b4dc904..b99329eb08 100644
--- a/tests/offset/faces_type_i/K6
+++ b/tests/offset/faces_type_i/K6
@@ -1,9 +1,5 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 ptorus s 10 10 0 45 270
 
 OFFSETSHAPE -1 {s_4} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 6083.13
diff --git a/tests/offset/faces_type_i/M6 b/tests/offset/faces_type_i/M6
index 2c80d4ef6b..201b7948dd 100644
--- a/tests/offset/faces_type_i/M6
+++ b/tests/offset/faces_type_i/M6
@@ -1,7 +1,3 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 circle w -20 0 0 20
 mkedge w w 0 pi*2/5
 wire w w
@@ -11,4 +7,4 @@ pipe s w profile
 
 OFFSETSHAPE 1 {s_2 s_3} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 785.398
diff --git a/tests/offset/faces_type_i/M8 b/tests/offset/faces_type_i/M8
index d3d09151af..0bb6b8738e 100644
--- a/tests/offset/faces_type_i/M8
+++ b/tests/offset/faces_type_i/M8
@@ -1,7 +1,3 @@
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
-
 circle w -20 0 0 20
 mkedge w w 0 pi*2/5
 wire w w
@@ -11,4 +7,4 @@ pipe s w profile
 
 OFFSETSHAPE 1 {s_4 s_5} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 785.398
diff --git a/tests/offset/faces_type_i/N1 b/tests/offset/faces_type_i/N1
index da57c569ca..c7220e1191 100644
--- a/tests/offset/faces_type_i/N1
+++ b/tests/offset/faces_type_i/N1
@@ -1,8 +1,5 @@
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO OCC23748 ALL: Error: The command cannot be built"
-puts "TODO OCC26556 ALL: Error : The offset cannot be built."
+puts "TODO CR23530 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The area of face "
 
 beziersurf c 3 2 \
 0 0 0 0 5 5 2 14 3 \
@@ -12,4 +9,4 @@ prism s c 0 0 20
 
 OFFSETSHAPE 1 {s_5 s_6} $calcul $type
 
-checkprops result -v 0
+checkprops result -v 3340
diff --git a/tests/offset/shape/A1 b/tests/offset/shape/A1
index 61adf130be..41f76e6be8 100644
--- a/tests/offset/shape/A1
+++ b/tests/offset/shape/A1
@@ -1,5 +1,3 @@
-puts "TODO OCC23068 All: ERROR. offsetperform operation not done."
-puts "TODO OCC23068 All: Error : The volume of result shape is"
 # Original bug : hkg60144
 # Date : 17Juillet98
 
@@ -9,5 +7,5 @@ explode s f
 offsetshape result s -5 s_1
 
 
-checkprops result -v 2.12817e+006
+checkprops result -v 2.80312e+07