From ac6c5e6b48da3ab48422bfde8d5164091fbde270 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 21 May 2014 02:05:26 +0000 Subject: [PATCH] lua - nullcheck bizstring.split() --- BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs index 35f46d5b92..76db885d01 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.String.cs @@ -144,13 +144,16 @@ namespace BizHawk.Client.Common public LuaTable Split(string str, string separator) { var table = Lua.NewTable(); - var splitStr = str.Split( - new char[] { separator.FirstOrDefault() }, - StringSplitOptions.RemoveEmptyEntries); - - for(int i = 0; i < splitStr.Length; i++) + if (!string.IsNullOrEmpty(str)) { - table[i] = splitStr[i]; + var splitStr = str.Split( + new char[] { separator.FirstOrDefault() }, + StringSplitOptions.RemoveEmptyEntries); + + for (int i = 0; i < splitStr.Length; i++) + { + table[i] = splitStr[i]; + } } return table;