F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 2044: Buffer::Iterator::ReadNtohU16() and ReadNtohU32() not implemented correctly

Browse Source
This commit is contained in:
Tom Henderson
2015-01-30 16:27:50 -08:00
parent 2be7d2e686
commit ffa4909b25
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/model/buffer.h
View File

@@ -959,7 +959,7 @@ Buffer::Iterator::ReadNtohU16 (void)
}
else if (m_current >= m_zeroEnd)
{
buffer = &m_data[m_current];
buffer = &m_data[m_current - (m_zeroEnd - m_zeroStart)];
}
else
{
@@ -983,7 +983,7 @@ Buffer::Iterator::ReadNtohU32 (void)
}
else if (m_current >= m_zeroEnd)
{
buffer = &m_data[m_current];
buffer = &m_data[m_current - (m_zeroEnd - m_zeroStart)];
}
else
{

19
src/network/test/buffer-test.cc
View File

@@ -321,6 +321,25 @@ BufferTest::DoRun (void)
NS_TEST_ASSERT_MSG_EQ ( evilBuffer [i], cBuf [i] , "Bad buffer peeked");
}
free (cBuf);
/// \internal See \bugid{2044} Will not pass without bug2044 fix.
buffer = Buffer (1);
buffer.AddAtEnd (2);
i = buffer.Begin ();
i.Next (1);
i.WriteU8 (0x77);
i.WriteU8 (0x66);
ENSURE_WRITTEN_BYTES (buffer, 3, 0x00, 0x77, 0x66);
i = buffer.Begin ();
i.ReadU8 ();
uint16_t val1 = i.ReadNtohU16 ();
i = buffer.Begin ();
i.ReadU8 ();
uint16_t val2 = 0;
val2 |= i.ReadU8 ();
val2 <<= 8;
val2 |= i.ReadU8 ();
NS_TEST_ASSERT_MSG_EQ (val1, val2, "Bad ReadNtohU16()");
}
//-----------------------------------------------------------------------------
class BufferTestSuite : public TestSuite