Fix memory leaks

The-Powder-Toy · Mar 20, 2017 · 2d4c195 · 2d4c195
1 parent 2d5d928
commit 2d4c195
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Platform.cpp b/src/Platform.cpp
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
+#include <cassert>
 #ifdef WIN
 #include <shlobj.h>
 #include <shlwapi.h>
@@ -31,7 +32,9 @@ char *ExecutableName(void)
 	uint32_t max = 64, res;
 	if (_NSGetExecutablePath(fn, &max) != 0)
 	{
-		fn = (char*)realloc(fn, max);
+		char *realloced_fn = (char*)realloc(fn, max);
+		assert(realloced_fn != NULL);
+		fn = realloced_fn;
 		_NSGetExecutablePath(fn, &max);
 	}
 	if (realpath(fn, name) == NULL)
@@ -51,7 +54,9 @@ char *ExecutableName(void)
 #endif
 #ifndef MACOSX
 		max *= 2;
-		name = (char *)realloc(name, max);
+		char* realloced_name = (char *)realloc(name, max);
+		assert(realloced_name != NULL);
+		name = realloced_name;
 		memset(name, 0, max);
 	}
 #endif

diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
@@ -1010,8 +1010,10 @@ void Simulation::ApplyDecorationFill(Renderer *ren, int x, int y, int colR, int
 		return;
 	memset(bitmap, 0, XRES*YRES);
 
-	if (!ColorCompare(ren, x, y, replaceR, replaceG, replaceB))
+	if (!ColorCompare(ren, x, y, replaceR, replaceG, replaceB)) {
+		free(bitmap);
 		return;
+	}
 
 	try
 	{