fix string with encoding create exception

alec1o · May 16, 2024 · ef3bfb0 · ef3bfb0
1 parent c771a9e
commit ef3bfb0
Showing 1 changed file with 38 additions and 26 deletions.
diff --git a/src/Source/Reader.cs b/src/Source/Reader.cs
@@ -17,7 +17,9 @@ public class Reader : IReader, IDisposable
         #region Builder
 
         // private for IDisposable
-        private Reader() { }
+        private Reader()
+        {
+        }
 
         public Reader(byte[] buffer, int offset = 0)
         {
@@ -344,8 +346,8 @@ public T Read<T>()
 
                     // skip y bytes read
                     _position += sizeof(float);
-                    
-                    
+
+
                     // get encoded value
                     var w = BitConverter.ToSingle(_buffer, _position);
 
@@ -355,42 +357,52 @@ public T Read<T>()
                     return (T)(object)new Float4(x, y, z, w);
                 }
             }
-            catch { }
+            catch
+            {
+                //
+            }
 
             _success = false;
             return default;
         }
 
         public T Read<T>(Encoding encode)
         {
-            char prefix = Writer.GetPrefix(typeof(T));
-
-            // string
-            if (typeof(T) == typeof(string))
+            try
             {
-                // compare (buffer prefix) to (type prefix)
-                if (!ValidPrefix(prefix)) return default;
+                char prefix = Writer.GetPrefix(typeof(T));
 
-                // get length of bytes
-                int length = BitConverter.ToInt32(_buffer, _position);
-                _position += sizeof(int);
-                if (length <= 0 || length > (Length - _position))
+                // string
+                if (typeof(T) == typeof(string))
                 {
-                    _success = false;
-                    return default;
-                }
+                    // compare (buffer prefix) to (type prefix)
+                    if (!ValidPrefix(prefix)) return default;
 
-                // get encoded value
-                byte[] bytes = new byte[length];
-                Buffer.BlockCopy(_buffer, _position, bytes, 0, bytes.Length);
+                    // get length of bytes
+                    int length = BitConverter.ToInt32(_buffer, _position);
+                    _position += sizeof(int);
+                    if (length <= 0 || length > (Length - _position))
+                    {
+                        _success = false;
+                        return default;
+                    }
 
-                // skip bytes read
-                _position += bytes.Length;
+                    // get encoded value
+                    byte[] bytes = new byte[length];
+                    Buffer.BlockCopy(_buffer, _position, bytes, 0, bytes.Length);
+
+                    // skip bytes read
+                    _position += bytes.Length;
 
-                // convert bytes to string
-                string value = encode.GetString(bytes);
+                    // convert bytes to string
+                    string value = encode.GetString(bytes);
 
-                return (T)(object)value;
+                    return (T)(object)value;
+                }
+            }
+            catch
+            {
+                //
             }
 
             _success = false;
@@ -460,4 +472,4 @@ protected virtual void Dispose(bool disposing)
 
         #endregion
     }
-}
+}