From 7c0da76402a6b53237ecec34757f686d2fac642b Mon Sep 17 00:00:00 2001
From: Chaosus <chaosus89@gmail.com>
Date: Mon, 26 Feb 2018 12:47:58 +0300
Subject: [PATCH] Fix 3 memory leaks

---
 thirdparty/README.md                                    | 9 +++++++++
 thirdparty/b2d_convexdecomp/b2Polygon.cpp               | 7 ++++++-
 thirdparty/etc2comp/EtcFilter.cpp                       | 3 +++
 thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.cc | 4 +++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/thirdparty/README.md b/thirdparty/README.md
index ff05f3d084f..b704764038e 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -11,6 +11,9 @@ The files were adapted to Godot by removing the dependency on b2Math (replacing
 it by b2Glue.h) and commenting out some verbose printf calls.
 Upstream code has not changed in 10 years, no need to keep track of changes.
 
+Important: Some files have Godot-made changes.
+They are marked with `// -- GODOT start --` and `// -- GODOT end --`
+comments.
 
 ## bullet
 
@@ -69,6 +72,9 @@ Files extracted from upstream source:
 - all .cpp and .h files in EtcLib/
 - README.md, LICENSE, AUTHORS
 
+Important: Some files have Godot-made changes.
+They are marked with `// -- GODOT start --` and `// -- GODOT end --`
+comments.
 
 ## fonts
 
@@ -165,6 +171,9 @@ Files extracted from upstream source:
 
 TODO.
 
+Important: Some files have Godot-made changes.
+They are marked with `// -- GODOT start --` and `// -- GODOT end --`
+comments.
 
 ## libtheora
 
diff --git a/thirdparty/b2d_convexdecomp/b2Polygon.cpp b/thirdparty/b2d_convexdecomp/b2Polygon.cpp
index b6ead62c634..c80204ae212 100644
--- a/thirdparty/b2d_convexdecomp/b2Polygon.cpp
+++ b/thirdparty/b2d_convexdecomp/b2Polygon.cpp
@@ -1342,7 +1342,12 @@ b2Polygon TraceEdge(b2Polygon* p){
 				if (nodes[j].nConnected == 0) continue;
 				b2Vec2 diff = nodes[i].position - nodes[j].position;
 				if (diff.LengthSquared() <= COLLAPSE_DIST_SQR){
-					if (nActive <= 3) return b2Polygon();
+					if (nActive <= 3) {
+						// -- GODOT start --
+						delete[] nodes;
+						// -- GODOT end --
+						return b2Polygon();
+					}	
 					//printf("Found dupe, %d left\n",nActive);
 					--nActive;
 					foundDupe = true;
diff --git a/thirdparty/etc2comp/EtcFilter.cpp b/thirdparty/etc2comp/EtcFilter.cpp
index bc899a533ea..1ec8acdf3f3 100644
--- a/thirdparty/etc2comp/EtcFilter.cpp
+++ b/thirdparty/etc2comp/EtcFilter.cpp
@@ -228,6 +228,9 @@ int FilterTwoPass( RGBCOLOR *pSrcImage, int srcWidth, int srcHeight,
     pTempImage = (RGBCOLOR *)malloc( destWidth * srcHeight * sizeof(RGBCOLOR) );
     if ( pTempImage == NULL )
     {
+        // -- GODOT start --
+        free( contrib );
+        // -- GODOT end --
         return 0;
     }
 
diff --git a/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.cc b/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.cc
index bda67a57582..d2375edb3be 100644
--- a/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.cc
+++ b/thirdparty/libsimplewebm/libwebm/mkvparser/mkvparser.cc
@@ -1284,7 +1284,9 @@ long Segment::DoLoadCluster(long long& pos, long& len) {
     pos += cluster_size;
 
     m_pos = pos;
-
+    // -- GODOT start --
+    delete pCluster;
+    // -- GODOT end --
     if (segment_stop > 0 && m_pos > segment_stop)
       return E_FILE_FORMAT_INVALID;