libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make memory reader truncate read and only issue error starting at end

This commit is contained in:
Jack Andersen 2017-10-27 00:08:16 -10:00
parent e3ce09d914
commit 0fa861b708
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/athena/MemoryReader.cpp
View File

@ -142,7 +142,7 @@ atUint8* MemoryReader::data() const
atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length) atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length)
{ {
if (m_position + length > m_length) if (m_position >= m_length)
{ {
if (m_globalErr) if (m_globalErr)
atFatal("Position %0.8X outside stream bounds ", m_position); atFatal("Position %0.8X outside stream bounds ", m_position);
@ -151,6 +151,7 @@ atUint64 MemoryReader::readUBytesToBuf(void* buf, atUint64 length)
return 0; return 0;
} }
length = std::min(length, m_length - m_position);
memmove(buf, reinterpret_cast<const atUint8*>(m_data) + m_position, length); memmove(buf, reinterpret_cast<const atUint8*>(m_data) + m_position, length);
m_position += length; m_position += length;
return length; return length;