From 4dbe0967d5fb99a57786649ad9a00785e5fcb621 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Fri, 16 Jun 2017 02:39:16 +0200 Subject: [PATCH] Fixed memory leaks - PoolVector leak - mesh_remove_surface leak --- core/dvector.h | 8 +++++++- drivers/gles3/rasterizer_storage_gles3.cpp | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/dvector.h b/core/dvector.h index 2e951b96612..4584a300f9d 100644 --- a/core/dvector.h +++ b/core/dvector.h @@ -92,6 +92,7 @@ class PoolVector { // ERR_FAIL_COND(alloc->lock>0); should not be illegal to lock this for copy on write, as it's a copy on write after all + // Refcount should not be zero, otherwise it's a misuse of COW if (alloc->refcount.get() == 1) return; //nothing to do @@ -216,7 +217,12 @@ class PoolVector { { int cur_elements = alloc->size / sizeof(T); - Write w = write(); + + // Don't use write() here because it could otherwise provoke COW, + // which is not desirable here because we are destroying the last reference anyways + Write w; + // Reference to still prevent other threads from touching the alloc + w._ref(alloc); for (int i = 0; i < cur_elements; i++) { diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index a38e149aff2..ff483a0fde7 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -3107,6 +3107,7 @@ void RasterizerStorageGLES3::mesh_remove_surface(RID p_mesh, int p_surface) { } glDeleteVertexArrays(1, &surface->array_id); + glDeleteVertexArrays(1, &surface->instancing_array_id); for (int i = 0; i < surface->blend_shapes.size(); i++) {