[Bf-blender-cvs] [bac2541ffa3] blender-v2.79a-release: Fix T53686: VSE Render crash when zooming timeline.

Bastien Montagne noreply at git.blender.org
Thu Feb 1 15:56:50 CET 2018


Commit: bac2541ffa39b283d3ccacde5590a3fd656689d3
Author: Bastien Montagne
Date:   Thu Feb 1 15:53:49 2018 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rBbac2541ffa39b283d3ccacde5590a3fd656689d3

Fix T53686: VSE Render crash when zooming timeline.

Epic fail from recent 'security' fixes (rBe04d7c49dca9). ;)

To be backported to 2.79a!

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index da2a7e822fe..9b6006636ac 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1658,7 +1658,7 @@ static void shapekey_layers_to_keyblocks(DerivedMesh *dm, Mesh *me, int actshape
 		cos = CustomData_get_layer_n(&dm->vertData, CD_SHAPEKEY, i);
 		kb->totelem = dm->numVertData;
 
-		kb->data = kbcos = MEM_malloc_arrayN(kb->totelem, sizeof(float), "kbcos DerivedMesh.c");
+		kb->data = kbcos = MEM_malloc_arrayN(kb->totelem, 3 * sizeof(float), "kbcos DerivedMesh.c");
 		if (kb->uid == actshape_uid) {
 			MVert *mvert = dm->getVertArray(dm);



More information about the Bf-blender-cvs mailing list