X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin4_src%2FCommon%2Fserialisation.cpp;fp=Usermode%2FApplications%2Faxwin4_src%2FCommon%2Fserialisation.cpp;h=7bb77bf5b37afa4181c95dd6d2ca72be17abd0c0;hb=73872ce04c3759b35e010af9c16367bc57a14d38;hp=3dc2071075776eeb56a89841a7845eb09c4c9439;hpb=d8bba2e3edc6f772656d8767aff978377063c48f;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Common/serialisation.cpp b/Usermode/Applications/axwin4_src/Common/serialisation.cpp
index 3dc20710..7bb77bf5 100644
--- a/Usermode/Applications/axwin4_src/Common/serialisation.cpp
+++ b/Usermode/Applications/axwin4_src/Common/serialisation.cpp
@@ -26,8 +26,7 @@ bool CDeserialiser::IsConsumed() const
 
 ::uint8_t CDeserialiser::ReadU8()
 {
-	if( m_offset + 1 >= m_length )
-		throw ::std::out_of_range("CDeserialiser::ReadU8");
+	RangeCheck("CDeserialiser::ReadU8", 1);
 	uint8_t rv = m_data[m_offset];
 	m_offset ++;
 	return rv;
@@ -35,9 +34,7 @@ bool CDeserialiser::IsConsumed() const
 
 ::uint16_t CDeserialiser::ReadU16()
 {
-	if( m_offset + 2 >= m_length )
-		throw ::std::out_of_range("CDeserialiser::ReadU16");
-	
+	RangeCheck("CDeserialiser::ReadU16", 2);
 	uint16_t rv = m_data[m_offset] | ((uint16_t)m_data[m_offset+1] << 8);
 	m_offset += 2;
 	return rv;