From e3cb22889a06e53d8cdd30df5251690dec6b6d52 Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Wed, 4 Jun 2014 18:53:57 +0000
Subject: [PATCH] add some extra error checking to the text savestate system
 used by gameboy and wonderswan.  does not change the actual savestate format
 at all

---
 BizHawk.Emulation.Common/TextState.cs         | 33 ++++++++++++++++---
 .../Consoles/Nintendo/Gameboy/Gambatte.cs     |  4 +--
 .../Consoles/WonderSwan/WonderSwan.cs         |  4 +--
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Emulation.Common/TextState.cs b/BizHawk.Emulation.Common/TextState.cs
index e1b76d677c..0e80e21a94 100644
--- a/BizHawk.Emulation.Common/TextState.cs
+++ b/BizHawk.Emulation.Common/TextState.cs
@@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Common
 
 	// T is a class that has any other data you want to serialize in it
 	public class TextState<T>
-		where T: new()
+		where T : new()
 	{
 		public TextState()
 		{
@@ -41,15 +41,30 @@ namespace BizHawk.Emulation.Common
 		{
 			byte[] d = new byte[length];
 			Marshal.Copy(data, d, 0, length);
-			Current.Data.Add(name, d);
+			Current.Data.Add(name, d); // will except for us if the key is already present
 		}
 		public void Load(IntPtr data, int length, string name)
 		{
 			byte[] d = Current.Data[name];
+			if (length != d.Length)
+				throw new InvalidOperationException();
 			Marshal.Copy(d, 0, data, length);
 		}
+		public void EnterSectionSave(string name)
+		{
+			Node next = new Node();
+			Current.Objects.Add(name, next);
+			Nodes.Push(next);
+		}
+		public void EnterSectionLoad(string name)
+		{
+			Node next = Current.Objects[name];
+			Nodes.Push(next);
+		}
 		public void EnterSection(string name)
 		{
+			// works for either save or load, but as a consequence cannot report intelligent
+			// errors about section name mismatches
 			Node next = null;
 			Current.Objects.TryGetValue(name, out next);
 			if (next == null)
@@ -69,13 +84,23 @@ namespace BizHawk.Emulation.Common
 		// other data besides the core
 		public T ExtraData;
 
-		public TextStateFPtrs GetFunctionPointers()
+		public TextStateFPtrs GetFunctionPointersSave()
 		{
 			return new TextStateFPtrs
 			{
 				Save = new TextStateFPtrs.DataFunction(Save),
+				Load = null,
+				EnterSection = new TextStateFPtrs.SectionFunction(EnterSectionSave),
+				ExitSection = new TextStateFPtrs.SectionFunction(ExitSection)
+			};
+		}
+		public TextStateFPtrs GetFunctionPointersLoad()
+		{
+			return new TextStateFPtrs
+			{
+				Save = null,
 				Load = new TextStateFPtrs.DataFunction(Load),
-				EnterSection = new TextStateFPtrs.SectionFunction(EnterSection),
+				EnterSection = new TextStateFPtrs.SectionFunction(EnterSectionLoad),
 				ExitSection = new TextStateFPtrs.SectionFunction(ExitSection)
 			};
 		}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index 1f489b5635..7158569dd2 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -503,7 +503,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 		{
 			var s = new TextState<TextStateData>();
 			s.Prepare();
-			var ff = s.GetFunctionPointers();
+			var ff = s.GetFunctionPointersSave();
 			LibGambatte.gambatte_newstatesave_ex(GambatteState, ref ff);
 			s.ExtraData.IsLagFrame = IsLagFrame;
 			s.ExtraData.LagCount = LagCount;
@@ -521,7 +521,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 		{
 			var s = (TextState<TextStateData>)ser.Deserialize(reader, typeof(TextState<TextStateData>));
 			s.Prepare();
-			var ff = s.GetFunctionPointers();
+			var ff = s.GetFunctionPointersLoad();
 			LibGambatte.gambatte_newstateload_ex(GambatteState, ref ff);
 			IsLagFrame = s.ExtraData.IsLagFrame;
 			LagCount = s.ExtraData.LagCount;
diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
index 96dc46f96b..b34dec3c0e 100644
--- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
+++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
@@ -182,7 +182,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 		{
 			var s = new TextState<TextStateData>();
 			s.Prepare();
-			var ff = s.GetFunctionPointers();
+			var ff = s.GetFunctionPointersSave();
 			BizSwan.bizswan_txtstatesave(Core, ref ff);
 			s.ExtraData.IsLagFrame = IsLagFrame;
 			s.ExtraData.LagCount = LagCount;
@@ -201,7 +201,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 		{
 			var s = (TextState<TextStateData>)ser.Deserialize(reader, typeof(TextState<TextStateData>));
 			s.Prepare();
-			var ff = s.GetFunctionPointers();
+			var ff = s.GetFunctionPointersLoad();
 			BizSwan.bizswan_txtstateload(Core, ref ff);
 			IsLagFrame = s.ExtraData.IsLagFrame;
 			LagCount = s.ExtraData.LagCount;