Merge branch 'master' of github.com:openscad/openscad

2 files changed, 6 insertions, 4 deletions

diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index 3940b06..68b8200 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 #
 # This script builds all library dependencies of OpenSCAD for Mac OS X.
 # The libraries will be build in 32- and 64-bit mode and backwards compatible with 
@@ -201,7 +201,7 @@ build_opencsg()
 
 echo "Using basedir:" $BASEDIR
 mkdir -p $SRCDIR $DEPLOYDIR
-build_gmp 5.0.2
+build_gmp 5.0.3
 build_mpfr 3.1.0
 build_boost 1.47.0
 # NB! For CGAL, also update the actual download URL in the function
diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc
index c3f4774..22567f2 100644
--- a/src/PolySetCGALEvaluator.cc
+++ b/src/PolySetCGALEvaluator.cc
@@ -90,6 +90,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node)
 		}
 
 		PolySet *ps3 = sum.convertToPolyset();
+		if (!ps3) return NULL;
 		Grid2d<int> conversion_grid(GRID_COARSE);
 		for (size_t i = 0; i < ps3->polygons.size(); i++) {
 			for (size_t j = 0; j < ps3->polygons[i].size(); j++) {
@@ -121,6 +122,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node)
 		}
 
 		PolySet *ps3 = sum.convertToPolyset();
+		if (!ps3) return NULL;
 		CGAL_Nef_polyhedron np;
 		for (size_t i = 0; i < ps3->polygons.size(); i++)
 		{
@@ -385,7 +387,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const CgaladvNode &node)
 	PolySet *ps = NULL;
 	if (!N.empty()) {
 		ps = N.convertToPolyset();
-		ps->convexity = node.convexity;
+		if (ps) ps->convexity = node.convexity;
 	}
 
 	return ps;
@@ -401,7 +403,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const RenderNode &node)
 		}
 		else {
 			ps = N.convertToPolyset();
-			ps->convexity = node.convexity;
+			if (ps) ps->convexity = node.convexity;
 		}
 	}
 	return ps;