Set limits in MerkleBlockPayload (3x) (neo-project#1377)

* Set limits in MerkleBlockPayload (3x) * Update MerkleBlockPayload.cs * Update src/neo/Network/P2P/Payloads/MerkleBlockPayload.cs Co-Authored-By: Erik Zhang <[email protected]> * Update MerkleBlockPayload.cs Co-authored-by: Erik Zhang <[email protected]>
Tommo-L · Jan 10, 2020 · fefd2f4 · fefd2f4
1 parent 38c0d6b
commit fefd2f4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/neo/Network/P2P/Payloads/MerkleBlockPayload.cs b/src/neo/Network/P2P/Payloads/MerkleBlockPayload.cs
@@ -37,9 +37,9 @@ public static MerkleBlockPayload Create(Block block, BitArray flags)
         public override void Deserialize(BinaryReader reader)
         {
             base.Deserialize(reader);
-            ContentCount = (int)reader.ReadVarInt(int.MaxValue);
-            Hashes = reader.ReadSerializableArray<UInt256>();
-            Flags = reader.ReadVarBytes();
+            ContentCount = (int)reader.ReadVarInt(Block.MaxTransactionsPerBlock + 1);
+            Hashes = reader.ReadSerializableArray<UInt256>(ContentCount);
+            Flags = reader.ReadVarBytes((ContentCount + 7) / 8);
         }
 
         public override void Serialize(BinaryWriter writer)