From 7320568d1dea65256a41690c0bc2009e781a584e Mon Sep 17 00:00:00 2001
From: Jeremy Hu <huxingyi@msn.com>
Date: Fri, 31 Aug 2018 23:49:32 +0800
Subject: [PATCH] Fix crash on union empty meshs

---
 src/meshutil.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/meshutil.cpp b/src/meshutil.cpp
index 435dd9ed..bfb93b76 100644
--- a/src/meshutil.cpp
+++ b/src/meshutil.cpp
@@ -58,6 +58,7 @@ typename CGAL::Surface_mesh<typename Kernel::Point_3> *makeCgalMeshFromMeshlite(
     int *faceVertexNumAndIndices = new int[faceCount * MAX_VERTICES_PER_FACE];
     int filledLength = meshlite_get_face_index_array(meshlite, meshId, faceVertexNumAndIndices, faceCount * MAX_VERTICES_PER_FACE);
     int i = 0;
+    int addedFaceCount = 0;
     while (i < filledLength) {
         int num = faceVertexNumAndIndices[i++];
         assert(num > 0 && num <= MAX_VERTICES_PER_FACE);
@@ -69,10 +70,15 @@ typename CGAL::Surface_mesh<typename Kernel::Point_3> *makeCgalMeshFromMeshlite(
         }
         if (faceVertexIndices.size() >= 3) {
             mesh->add_face(faceVertexIndices);
+            addedFaceCount++;
         }
     }
     delete[] faceVertexNumAndIndices;
     delete[] vertexPositions;
+    if (0 == addedFaceCount) {
+        delete mesh;
+        mesh = nullptr;
+    }
     return mesh;
 }
 
@@ -157,7 +163,12 @@ ExactMesh *makeCgalConvexHullMeshFromMeshlite(void *meshlite, int meshId)
         offset += 3;
     }
     delete[] vertexPositions;
-    CGAL::convex_hull_3(points.begin(), points.end(), *mesh);
+    try {
+        CGAL::convex_hull_3(points.begin(), points.end(), *mesh);
+    } catch (...) {
+        delete mesh;
+        return nullptr;
+    }
     return mesh;
 }
 
@@ -309,6 +320,9 @@ void *convertToCombinableMesh(void *meshliteContext, int meshId)
     if (0 == meshId)
         return nullptr;
     mesh = makeCgalMeshFromMeshlite<ExactKernel>(meshliteContext, meshId);
+    if (nullptr == mesh) {
+        return mesh;
+    }
     if (CGAL::Polygon_mesh_processing::does_self_intersect(*mesh)) {
         qDebug() << "CGAL::Polygon_mesh_processing::does_self_intersect meshId:" << meshId;
         delete mesh;