detect a fully degenerated mesh and avoid using it and so crashing ubOde

2 files changed, 18 insertions, 1 deletions

diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
index da8f623..b860255 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs
@@ -278,6 +278,16 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             return new Vector3(x, y, z);
         }
 
+        public int numberVertices()
+        {
+            return m_bdata.m_vertices.Count;
+        }
+
+        public int numberTriangles()
+        {
+            return m_bdata.m_triangles.Count;
+        }
+
         public List<Vector3> getVertexList()
         {
             List<Vector3> result = new List<Vector3>();
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
index 84df369..596ce0f 100644
--- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
+++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
@@ -337,7 +337,6 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
                     return null;
             }
 
-            primShape.SculptData = Utils.EmptyBytes;
 
             int numCoords = coords.Count;
             int numFaces = faces.Count;
@@ -355,6 +354,14 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
             coords.Clear();
             faces.Clear();
 
+            if(mesh.numberVertices() < 3 || mesh.numberTriangles() < 1)
+                {
+                m_log.ErrorFormat("[MESH]: invalid degenerated mesh for prim " + primName + " ignored");
+                return null;
+                }
+
+            primShape.SculptData = Utils.EmptyBytes;
+
             return mesh;
         }