ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ISViewerHandler: Stop copying data at null

This commit is contained in:
zilmar 2022-08-01 10:00:57 +09:30
parent 7b851e6b6e
commit d1a938d280
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Project64-core/N64System/MemoryHandler/ISViewerHandler.cpp
View File

@ -31,6 +31,11 @@ bool ISViewerHandler::Write32(uint32_t Address, uint32_t Value, uint32_t Mask)
{ {
if (m_BufferPos + MaskedValue <= (sizeof(m_Buffer) / sizeof(m_Buffer[0]))) if (m_BufferPos + MaskedValue <= (sizeof(m_Buffer) / sizeof(m_Buffer[0])))
{ {
size_t DataStrLen = strnlen((const char *)&m_Data[0x20], m_Data.size() - 0x20);
if (DataStrLen < MaskedValue)
{
MaskedValue = DataStrLen;
}
memcpy(&m_Buffer[m_BufferPos], (const char *)&m_Data[0x20], MaskedValue); memcpy(&m_Buffer[m_BufferPos], (const char *)&m_Data[0x20], MaskedValue);
m_BufferPos += MaskedValue; m_BufferPos += MaskedValue;
char * NewLine = (char *)memchr((void *)&m_Buffer[0], '\n', m_BufferPos); char * NewLine = (char *)memchr((void *)&m_Buffer[0], '\n', m_BufferPos);