[Bf-blender-cvs] [d41451a0ca] master: Forgotten in last commit: Check the allocation

[Germano Cavalcante]

Commit: d41451a0ca5053885deffce2bf603fc6c488ddf4
Author: Germano Cavalcante
Date:   Thu Feb 16 23:41:38 2017 -0300
Branches: master
https://developer.blender.org/rBd41451a0ca5053885deffce2bf603fc6c488ddf4

Forgotten in last commit: Check the allocation

===================================================================

M	source/blender/blenkernel/intern/bvhutils.c

===================================================================

diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index fbb2aba454..5a0006e679 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -587,7 +587,9 @@ BVHTree *bvhtree_from_mesh_verts(
 		        data, tree, true, epsilon, vert, vert_allocated);
 	}
 	else {
-		MEM_freeN(vert);
+		if (vert_allocated) {
+			MEM_freeN(vert);
+		}
 		memset(data, 0, sizeof(*data));
 	}
 	return tree;
@@ -792,8 +794,12 @@ BVHTree *bvhtree_from_mesh_edges(
 		        data, tree, true, epsilon, vert, vert_allocated, edge, edge_allocated);
 	}
 	else {
-		MEM_freeN(vert);
-		MEM_freeN(edge);
+		if (vert_allocated) {
+			MEM_freeN(vert);
+		}
+		if (edge_allocated) {
+			MEM_freeN(edge);
+		}
 		memset(data, 0, sizeof(*data));
 	}
 	return tree;
@@ -943,8 +949,12 @@ BVHTree *bvhtree_from_mesh_faces(
 		        data, tree, true, epsilon, vert, vert_allocated, face, face_allocated);
 	}
 	else {
-		MEM_freeN(vert);
-		MEM_freeN(face);
+		if (vert_allocated) {
+			MEM_freeN(vert);
+		}
+		if (face_allocated) {
+			MEM_freeN(face);
+		}
 		memset(data, 0, sizeof(*data));
 	}
 	return tree;