Merge pull request SapphireServer#56 from Lotlab/bug-fixes

Bug fixes
takhlaq · May 26, 2023 · 1d855be · 1d855be
2 parents 432443e + 1bf8fe5
commit 1d855be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/FFXIVMonReborn/Importers/XmlCaptureImporter.cs b/FFXIVMonReborn/Importers/XmlCaptureImporter.cs
@@ -39,9 +39,8 @@ public static Capture Load(string path)
 
         public static void Save(Capture capture, string path)
         {
-            //using (var fileStream = new FileStream(path, FileMode.Create))
+            using (var fileStream = new FileStream(path, FileMode.Create))
             {
-                var fileStream = new FileStream(path, FileMode.Create);
                 if (capture != null)
                 {
                     foreach (var packet in capture.Packets)

diff --git a/FFXIVMonReborn/Views/DataTypeView.xaml.cs b/FFXIVMonReborn/Views/DataTypeView.xaml.cs
@@ -88,15 +88,13 @@ public void Apply(byte[] data, int offset)
                             thisItem.ValueCol = $"{DateTimeOffset.FromUnixTimeSeconds(BitConverter.ToUInt32(data, offset)).ToLocalTime()}";
                         else if (thisItem.DataTypeCol == "string (ascii)")
                         {
-                            var str = Encoding.ASCII.GetString(data);
-                            var terminatorOffset = str.IndexOf((char)0, offset);
-                            thisItem.ValueCol = str.Substring(offset, terminatorOffset - offset);
+                            var term = getTerminator(data, offset);
+                            thisItem.ValueCol = Encoding.ASCII.GetString(data, offset, term - offset);
                         }
                         else if (thisItem.DataTypeCol == "string (utf8)")
                         {
-                            var str = Encoding.UTF8.GetString(data);
-                            var terminatorOffset = str.IndexOf((char)0, offset);
-                            thisItem.ValueCol = str.Substring(offset, terminatorOffset - offset);
+                            var term = getTerminator(data, offset);
+                            thisItem.ValueCol = Encoding.UTF8.GetString(data, offset, term - offset);
                         }
                         else if (thisItem.DataTypeCol == "binary")
                         {
@@ -127,7 +125,14 @@ public void Apply(byte[] data, int offset)
                 DataTypeListView.Items.Add(thisItem);
             }
         }
-
+        int getTerminator(byte[] data, int offset)
+        {
+            for (int i = offset; i < data.Length; i++)
+            {
+                if (data[i] == 0) return i;
+            }
+            return data.Length;
+        }
         private void DataTypeListView_KeyDown(object sender, KeyEventArgs e)
         {
             if (DataTypeListView.IsKeyboardFocusWithin)