[Bf-blender-cvs] [254282c] master: Fix crash when ding dyntopo sculpting

Sergey Sharybin noreply at git.blender.org
Thu Nov 26 20:19:58 CET 2015


Commit: 254282c6cbd0c9f6031fb108f858951d8563a809
Author: Sergey Sharybin
Date:   Fri Nov 27 00:16:43 2015 +0500
Branches: master
https://developer.blender.org/rB254282c6cbd0c9f6031fb108f858951d8563a809

Fix crash when ding dyntopo sculpting

This is a regression introduced by 77ac33d and was caused by use-after-free
mistake.

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

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

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

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 71354c2..93aa107 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1245,8 +1245,8 @@ static bool pbvh_bmesh_collapse_short_edges(
 
 	while (!BLI_heap_is_empty(eq_ctx->q->heap)) {
 		BMVert **pair = BLI_heap_popmin(eq_ctx->q->heap);
-		BLI_mempool_free(eq_ctx->pool, pair);
 		BMVert *v1 = pair[0], *v2 = pair[1];
+		BLI_mempool_free(eq_ctx->pool, pair);
 		pair = NULL;
 
 		/* Check the verts still exist */




More information about the Bf-blender-cvs mailing list