Fix AddBytes not resetting data segments

Closes #124
RiptideNetworking · Dec 10, 2023 · 4352e8a · 4352e8a
1 parent 2e8691c
commit 4352e8a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/RiptideNetworking/RiptideNetworking/Message.cs b/RiptideNetworking/RiptideNetworking/Message.cs
@@ -640,13 +640,20 @@ public Message AddBytes(byte[] array, bool includeLength = true)
             if (includeLength)
                 AddVarULong((uint)array.Length);
 
-            if (UnwrittenBits < array.Length * BitsPerByte)
+            int writeAmount = array.Length * BitsPerByte;
+            if (UnwrittenBits < writeAmount)
                 throw new InsufficientCapacityException(this, array.Length, ByteName, BitsPerByte);
 
             if (writeBit % BitsPerByte == 0)
             {
+                int bit = writeBit % BitsPerSegment;
+                if (bit + writeAmount > BitsPerSegment) // Range reaches into subsequent segment(s)
+                    data[(writeBit + writeAmount) / BitsPerSegment] = 0;
+                else if (bit == 0) // Range doesn't fill the current segment, but begins the segment
+                    data[writeBit / BitsPerSegment] = 0;
+
                 Buffer.BlockCopy(array, 0, data, writeBit / BitsPerByte, array.Length);
-                writeBit += array.Length * BitsPerByte;
+                writeBit += writeAmount;
             }
             else
             {
@@ -656,7 +663,7 @@ public Message AddBytes(byte[] array, bool includeLength = true)
                     writeBit += BitsPerByte;
                 }
             }
-            
+
             return this;
         }