From: Dániel Juhász <juhdanad@gmail.com>
Date: Fri, 21 Apr 2017 22:55:07 +0000 (+0200)
Subject: Fix a memory leak (#5636)
X-Git-Tag: 0.4.16~212
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8464da75857c1556f64984c0b014300638e38d4f;p=oweals%2Fminetest.git

Fix a memory leak (#5636)
---

diff --git a/src/mesh.cpp b/src/mesh.cpp
index 0a5b7fb6c..824d6891b 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -387,37 +387,39 @@ void recalculateBoundingBox(scene::IMesh *src_mesh)
 
 scene::IMeshBuffer* cloneMeshBuffer(scene::IMeshBuffer *mesh_buffer)
 {
-	scene::IMeshBuffer *clone = NULL;
 	switch (mesh_buffer->getVertexType()) {
 	case video::EVT_STANDARD: {
 		video::S3DVertex *v = (video::S3DVertex *) mesh_buffer->getVertices();
 		u16 *indices = mesh_buffer->getIndices();
-		scene::SMeshBuffer *temp_buf = new scene::SMeshBuffer();
-		temp_buf->append(v, mesh_buffer->getVertexCount(), indices,
+		scene::SMeshBuffer *cloned_buffer = new scene::SMeshBuffer();
+		cloned_buffer->append(v, mesh_buffer->getVertexCount(), indices,
 			mesh_buffer->getIndexCount());
-		return temp_buf;
-		break;
+		return cloned_buffer;
 	}
 	case video::EVT_2TCOORDS: {
 		video::S3DVertex2TCoords *v =
 			(video::S3DVertex2TCoords *) mesh_buffer->getVertices();
 		u16 *indices = mesh_buffer->getIndices();
-		scene::SMeshBufferTangents *temp_buf = new scene::SMeshBufferTangents();
-		temp_buf->append(v, mesh_buffer->getVertexCount(), indices,
+		scene::SMeshBufferTangents *cloned_buffer =
+			new scene::SMeshBufferTangents();
+		cloned_buffer->append(v, mesh_buffer->getVertexCount(), indices,
 			mesh_buffer->getIndexCount());
-		break;
+		return cloned_buffer;
 	}
 	case video::EVT_TANGENTS: {
 		video::S3DVertexTangents *v =
 			(video::S3DVertexTangents *) mesh_buffer->getVertices();
 		u16 *indices = mesh_buffer->getIndices();
-		scene::SMeshBufferTangents *temp_buf = new scene::SMeshBufferTangents();
-		temp_buf->append(v, mesh_buffer->getVertexCount(), indices,
+		scene::SMeshBufferTangents *cloned_buffer =
+			new scene::SMeshBufferTangents();
+		cloned_buffer->append(v, mesh_buffer->getVertexCount(), indices,
 			mesh_buffer->getIndexCount());
-		break;
+		return cloned_buffer;
 	}
 	}
-	return clone;
+	// This should not happen.
+	sanity_check(false);
+	return NULL;
 }
 
 scene::SMesh* cloneMesh(scene::IMesh *src_mesh)
diff --git a/src/mesh.h b/src/mesh.h
index 0e946caab..adaf0c836 100644
--- a/src/mesh.h
+++ b/src/mesh.h
@@ -85,6 +85,7 @@ void rotateMeshYZby (scene::IMesh *mesh, f64 degrees);
 
 /*
  *  Clone the mesh buffer.
+ *  The returned pointer should be dropped.
  */
 scene::IMeshBuffer* cloneMeshBuffer(scene::IMeshBuffer *mesh_buffer);