davejansen/lidgren-network-gen3
1
0
Fork 0
mirror of https://github.com/lidgren/lidgren-network-gen3.git synced 2026-05-17 07:36:32 +09:00
Code Issues Releases Activity

Fixed faulty assert in ReadByte(numBits)

Browse Source
This commit is contained in:
lidgren
2011-06-22 05:15:44 +00:00
parent e6d1338ca8
commit 2d4924878a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Lidgren.Network/NetIncomingMessage.Read.cs
View File

@@ -108,7 +108,7 @@ namespace Lidgren.Network
/// </summary> /// </summary>
public byte ReadByte(int numberOfBits) public byte ReadByte(int numberOfBits)
{ {
NetException.Assert(numberOfBits > 0 && numberOfBits < 8); NetException.Assert(numberOfBits > 0 && numberOfBits <= 8, "ReadByte(bits) can only read between 1 and 8 bits");
byte retval = NetBitWriter.ReadByte(m_data, numberOfBits, m_readPosition); byte retval = NetBitWriter.ReadByte(m_data, numberOfBits, m_readPosition);
m_readPosition += numberOfBits; m_readPosition += numberOfBits;
return retval; return retval;
@@ -205,7 +205,7 @@ namespace Lidgren.Network
/// </summary> /// </summary>
public Int32 ReadInt32(int numberOfBits) public Int32 ReadInt32(int numberOfBits)
{ {
NetException.Assert((numberOfBits > 0 && numberOfBits <= 32), "ReadInt() can only read between 1 and 32 bits"); NetException.Assert(numberOfBits > 0 && numberOfBits <= 32, "ReadInt32(bits) can only read between 1 and 32 bits");
NetException.Assert(m_bitLength - m_readPosition >= numberOfBits, c_readOverflowError); NetException.Assert(m_bitLength - m_readPosition >= numberOfBits, c_readOverflowError);
uint retval = NetBitWriter.ReadUInt32(m_data, numberOfBits, m_readPosition); uint retval = NetBitWriter.ReadUInt32(m_data, numberOfBits, m_readPosition);
@@ -245,7 +245,7 @@ namespace Lidgren.Network
[CLSCompliant(false)] [CLSCompliant(false)]
public UInt32 ReadUInt32(int numberOfBits) public UInt32 ReadUInt32(int numberOfBits)
{ {
NetException.Assert((numberOfBits > 0 && numberOfBits <= 32), "ReadUInt() can only read between 1 and 32 bits"); NetException.Assert(numberOfBits > 0 && numberOfBits <= 32, "ReadUInt32(bits) can only read between 1 and 32 bits");
//NetException.Assert(m_bitLength - m_readBitPtr >= numberOfBits, "tried to read past buffer size"); //NetException.Assert(m_bitLength - m_readBitPtr >= numberOfBits, "tried to read past buffer size");
UInt32 retval = NetBitWriter.ReadUInt32(m_data, numberOfBits, m_readPosition); UInt32 retval = NetBitWriter.ReadUInt32(m_data, numberOfBits, m_readPosition);
@@ -291,7 +291,7 @@ namespace Lidgren.Network
[CLSCompliant(false)] [CLSCompliant(false)]
public UInt64 ReadUInt64(int numberOfBits) public UInt64 ReadUInt64(int numberOfBits)
{ {
NetException.Assert((numberOfBits > 0 && numberOfBits <= 64), "ReadUInt() can only read between 1 and 64 bits"); NetException.Assert(numberOfBits > 0 && numberOfBits <= 64, "ReadUInt64(bits) can only read between 1 and 64 bits");
NetException.Assert(m_bitLength - m_readPosition >= numberOfBits, c_readOverflowError); NetException.Assert(m_bitLength - m_readPosition >= numberOfBits, c_readOverflowError);
ulong retval; ulong retval;
@@ -313,7 +313,7 @@ namespace Lidgren.Network
/// </summary> /// </summary>
public Int64 ReadInt64(int numberOfBits) public Int64 ReadInt64(int numberOfBits)
{ {
NetException.Assert(((numberOfBits > 0) && (numberOfBits < 65)), "ReadInt64(bits) can only read between 1 and 64 bits"); NetException.Assert(((numberOfBits > 0) && (numberOfBits <= 64)), "ReadInt64(bits) can only read between 1 and 64 bits");
return (long)ReadUInt64(numberOfBits); return (long)ReadUInt64(numberOfBits);
} }