[Bf-blender-cvs] [9e53a97] master: Fix T42093: segfault when trying to free unallocated depths zbuffer (border-zoom in 3DView).

[Bastien Montagne]

Commit: 9e53a97ddfbbe1bff3be585937318554f9c0eec6
Author: Bastien Montagne
Date:   Mon Oct 6 10:19:47 2014 +0200
Branches: master
https://developer.blender.org/rB9e53a97ddfbbe1bff3be585937318554f9c0eec6

Fix T42093: segfault when trying to free unallocated depths zbuffer (border-zoom in 3DView).

Thanks to jensverwiebe (jens verwiebe) for investigations too!

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

M	source/blender/editors/space_view3d/view3d_edit.c

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

diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index cff6761..f54e7ae 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3423,7 +3423,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
 		/* find the closest Z pixel */
 		depth_close = view3d_depth_near(&depth_temp);
 	
-		MEM_freeN(depth_temp.depths);
+		MEM_SAFE_FREE(depth_temp.depths);
 	}
 
 	cent[0] = (((double)rect.xmin) + ((double)rect.xmax)) / 2;
@@ -4640,7 +4640,7 @@ static float view_autodist_depth_margin(ARegion *ar, const int mval[2], int marg
 
 	view3d_update_depths_rect(ar, &depth_temp, &rect);
 	depth_close = view3d_depth_near(&depth_temp);
-	if (depth_temp.depths) MEM_freeN(depth_temp.depths);
+	MEM_SAFE_FREE(depth_temp.depths);
 	return depth_close;
 }