From 2bd7726b9b178bf63e587ba0424a7ad69c0ca3ca Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Wed, 12 Jul 2017 17:57:29 -0400
Subject: [PATCH] Fix a memory leak in the loonix waterbox interop code that's
 never been used before ever

---
 .../BizInvoke/CallingConventionAdapter.cs     | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Common/BizInvoke/CallingConventionAdapter.cs b/BizHawk.Common/BizInvoke/CallingConventionAdapter.cs
index 11ab29d2d7..c0d063fb10 100644
--- a/BizHawk.Common/BizInvoke/CallingConventionAdapter.cs
+++ b/BizHawk.Common/BizInvoke/CallingConventionAdapter.cs
@@ -23,8 +23,8 @@ namespace BizHawk.Common.BizInvoke
 	public static class CallingConventionAdapterExtensions
 	{
 		public static T GetDelegateForFunctionPointer<T>(this ICallingConventionAdapter a, IntPtr p)
-			where T: class
-		{ 
+			where T : class
+		{
 			return (T)(object)a.GetDelegateForFunctionPointer(p, typeof(T));
 		}
 	}
@@ -155,6 +155,16 @@ namespace BizHawk.Common.BizInvoke
 				throw new InvalidOperationException("Out of Thunk memory");
 			}
 
+			private int FindUsedIndex(object o)
+			{
+				for (int i = 0; i < _refs.Length; i++)
+				{
+					if (_refs[i] == o)
+						return i;
+				}
+				return -1;
+			}
+
 			private static void VerifyParameter(Type type)
 			{
 				if (type == typeof(float) || type == typeof(double))
@@ -202,8 +212,21 @@ namespace BizHawk.Common.BizInvoke
 
 			public IntPtr GetFunctionPointerForDelegate(Delegate d)
 			{
-				return GetArrivalFunctionPointer(
-					Marshal.GetFunctionPointerForDelegate(d), new ParameterInfo(d.GetType()), d);
+				// for this call only, the expectation is that it can be called multiple times
+				// on the same delegate and not leak extra memory, so the result has to be cached
+				lock (_sync)
+				{
+					var index = FindUsedIndex(d);
+					if (index != -1)
+					{
+						return GetThunkAddress(index);
+					}
+					else
+					{
+						return GetArrivalFunctionPointer(
+							Marshal.GetFunctionPointerForDelegate(d), new ParameterInfo(d.GetType()), d);
+					}
+				}
 			}
 
 			public IntPtr GetArrivalFunctionPointer(IntPtr p, ParameterInfo pp, object lifetime)