From 423376835c60d0da3a238db123d67ad4700bf3fc Mon Sep 17 00:00:00 2001
From: jdpurcell <jdpurcell@gmail.com>
Date: Sun, 18 Jan 2015 00:56:32 +0000
Subject: [PATCH] Rewinder - when reallocating buffer, make sure we have
 released all references to the old buffer first to free up memory for the new
 buffer.

---
 BizHawk.Client.Common/rewind/Rewinder.cs           | 8 +++++---
 BizHawk.Client.Common/rewind/StreamBlobDatabase.cs | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/rewind/Rewinder.cs b/BizHawk.Client.Common/rewind/Rewinder.cs
index 5f4c1c93ed..72cfbae791 100644
--- a/BizHawk.Client.Common/rewind/Rewinder.cs
+++ b/BizHawk.Client.Common/rewind/Rewinder.cs
@@ -235,12 +235,14 @@ namespace BizHawk.Client.Common
 				// if we have an appropriate buffer free, return it
 				if (_rewindBufferBacking != null)
 				{
-					var buf = _rewindBufferBacking;
-					_rewindBufferBacking = null;
-					if (buf.LongLength == size)
+					if (_rewindBufferBacking.LongLength == size)
 					{
+						var buf = _rewindBufferBacking;
+						_rewindBufferBacking = null;
 						return buf;
 					}
+
+					_rewindBufferBacking = null;
 				}
 
 				// otherwise, allocate it
diff --git a/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs b/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
index b1bb851374..1ec2f9e157 100644
--- a/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
+++ b/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
@@ -65,6 +65,7 @@ namespace BizHawk.Client.Common
 			{
 				long capacity = 0;
 				_mBufferManage(_mAllocatedBuffer, ref capacity, false);
+				_mAllocatedBuffer = null;
 			}
 		}