Buffer left space checks for primitive types

YohDeadfall · YohDeadfall · commit 73d6dc3708a6 · 2018-11-20T01:01:16.000+03:00
diff --git a/src/Npgsql/NpgsqlReadBuffer.cs b/src/Npgsql/NpgsqlReadBuffer.cs
@@ -227,18 +227,10 @@ public async Task Skip(long len, bool async)
         #region Read Simple
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public sbyte ReadSByte()
-        {
-            Debug.Assert(sizeof(sbyte) <= ReadBytesLeft);
-            return (sbyte)Buffer[ReadPosition++];
-        }
+        public sbyte ReadSByte() => Read<sbyte>();
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public byte ReadByte()
-        {
-            Debug.Assert(sizeof(byte) <= ReadBytesLeft);
-            return Buffer[ReadPosition++];
-        }
+        public byte ReadByte() => Read<byte>();
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public short ReadInt16()
@@ -337,12 +329,18 @@ public double ReadDouble(bool littleEndian)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         T Read<T>()
         {
-            Debug.Assert(Unsafe.SizeOf<T>() <= ReadBytesLeft);
+            if (Unsafe.SizeOf<T>() > ReadBytesLeft)
+                ThrowNotSpaceLeft();
+
             var result = Unsafe.ReadUnaligned<T>(ref Buffer[ReadPosition]);
             ReadPosition += Unsafe.SizeOf<T>();
             return result;
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void ThrowNotSpaceLeft()
+            => throw new InvalidOperationException("There is not enough space left in the buffer.");
+
         public string ReadString(int byteLen)
         {
             Debug.Assert(byteLen <= ReadBytesLeft);
diff --git a/src/Npgsql/NpgsqlWriteBuffer.cs b/src/Npgsql/NpgsqlWriteBuffer.cs
@@ -196,18 +196,10 @@ internal void DirectWrite(byte[] buffer, int offset, int count)
         #region Write Simple
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void WriteSByte(sbyte value)
-        {
-            Debug.Assert(sizeof(sbyte) <= WriteSpaceLeft);
-            Buffer[WritePosition++] = (byte)value;
-        }
+        public void WriteSByte(sbyte value) => Write(value);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void WriteByte(byte value)
-        {
-            Debug.Assert(sizeof(byte) <= WriteSpaceLeft);
-            Buffer[WritePosition++] = value;
-        }
+        public void WriteByte(byte value) => Write(value);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void WriteInt16(int value)
@@ -280,11 +272,17 @@ public void WriteDouble(double value, bool littleEndian)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         void Write<T>(T value)
         {
-            Debug.Assert(Unsafe.SizeOf<T>() <= WriteSpaceLeft);
+            if (Unsafe.SizeOf<T>() > WriteSpaceLeft)
+                ThrowNotSpaceLeft();
+
             Unsafe.WriteUnaligned(ref Buffer[WritePosition], value);
             WritePosition += Unsafe.SizeOf<T>();
         }
 
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void ThrowNotSpaceLeft()
+            => throw new InvalidOperationException("There is not enough space left in the buffer.");
+
         public Task WriteString(string s, int byteLen, bool async)
             => WriteString(s, s.Length, byteLen, async);
 
