From 1b2b7cfa2007172e07d78324bb941d0160b59c42 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Thu, 22 Sep 2016 17:34:14 -0400 Subject: Cycles: Fix overflow caused by wrong size calculation in Mesh::add_undisplaced --- intern/cycles/render/mesh.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 2d297c33446..3eff35bae9e 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -601,6 +601,12 @@ void Mesh::add_undisplaced() /* copy verts */ size_t size = attr->buffer_size(this, (subdivision_type == SUBDIVISION_NONE) ? ATTR_PRIM_TRIANGLE : ATTR_PRIM_SUBD); + + /* Center points for ngons aren't stored in Mesh::verts but are included in size since they will be + * calculated later, we subtract them from size here so we don't have an overflow while copying. + */ + size -= num_ngons * attr->data_sizeof(); + if(size) { memcpy(data, verts.data(), size); } -- cgit v1.2.3