From b41c2234644902a25dd1c2e2902ef2b0d9ff31a2 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Mon, 17 Aug 2015 16:30:35 -0500
Subject: [PATCH] fix unif loading of mapper names with junk in field beyond
 end of null termination. also made it utf-8 while i'm in there.

---
 BizHawk.Common/Extensions/IOExtensions.cs     | 19 ++++++++++++++-----
 .../Consoles/Nintendo/NES/Unif.cs             |  4 +++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Common/Extensions/IOExtensions.cs b/BizHawk.Common/Extensions/IOExtensions.cs
index ca14b3a570..d1a3f7d0b7 100644
--- a/BizHawk.Common/Extensions/IOExtensions.cs
+++ b/BizHawk.Common/Extensions/IOExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
@@ -27,14 +28,22 @@ namespace BizHawk.Common.IOExtensions
 		public static string ReadStringFixedAscii(this BinaryReader r, int bytes)
 		{
 			var read = new byte[bytes];
-			for (var b = 0; b < bytes; b++)
-			{
-				read[b] = r.ReadByte();
-			}
-
+			r.Read(read, 0, bytes);
 			return Encoding.UTF8.GetString(read);
 		}
 
+		public static string ReadStringUtf8NullTerminated(this BinaryReader br)
+		{
+			MemoryStream ms = new MemoryStream();
+			for (; ; )
+			{
+				var b = br.ReadByte();
+				if (b == 0)
+					return System.Text.Encoding.UTF8.GetString(ms.ToArray());
+				ms.WriteByte(b);
+			}
+		}
+
 		public static void CopyTo(this Stream src, Stream dest)
 		{
 			int size = (src.CanSeek) ? Math.Min((int)(src.Length - src.Position), 0x2000) : 0x2000;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
index 5ffe7174fc..5c2059bba5 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Unif.cs
@@ -5,6 +5,8 @@ using System.Text;
 using System.IO;
 
 using BizHawk.Common.BufferExtensions;
+using BizHawk.Common.IOExtensions;
+
 
 namespace BizHawk.Emulation.Cores.Nintendo.NES
 {
@@ -81,7 +83,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 
 			if (chunks.TryGetValue("MAPR", out tmp))
 			{
-				ci.board_type = Encoding.ASCII.GetString(tmp);
+				ci.board_type = new BinaryReader(new MemoryStream(tmp)).ReadStringUtf8NullTerminated();
 			}
 
 			ci.board_type = ci.board_type.TrimEnd('\0');