#120 Fix SJIS tunnel GetByteCount() not matching GetBytes()

arcusmaximus · Feb 16, 2023 · 8558ec6 · 8558ec6
1 parent b146ed7
commit 8558ec6
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/VNTextPatch.Shared/Util/SjisTunnelEncoding.cs b/VNTextPatch.Shared/Util/SjisTunnelEncoding.cs
@@ -9,7 +9,7 @@ public class SjisTunnelEncoding : Encoding
     {
         private static readonly Encoding SjisEncoding = GetEncoding(932, EncoderFallback.ExceptionFallback, DecoderFallback.ExceptionFallback);
 
-        private readonly char[] _charArray = new char[1];
+        private readonly byte[] _byteArray = new byte[2];
         private readonly Dictionary<char, char> _mappings = new Dictionary<char, char>();
 
         public SjisTunnelEncoding()
@@ -30,15 +30,10 @@ public override int GetByteCount(string str)
 
                 if (!tunneled)
                 {
-                    try
-                    {
-                        _charArray[0] = str[i];
-                        byteCount += SjisEncoding.GetByteCount(_charArray);
-                    }
-                    catch
-                    {
+                    if (TrySjisEncode(str, i, 1, _byteArray, 0, out int charByteCount))
+                        byteCount += charByteCount;
+                    else
                         tunneled = true;
-                    }
                 }
 
                 if (tunneled)