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

Merge pull request #394 from lioncash/bounds 

Fix some array bounds-related errors
This commit is contained in:
zilmar 2015-04-17 06:21:08 +10:00
parent 04421079ea e9c056e5a4
commit 6426b76bfc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64/N64 System/Mips/Memory Labels Class.cpp
View File

@ -208,10 +208,10 @@ void CMemoryLabel::ProcessCODFile(BYTE * File, DWORD FileLen)
} }
} }
if (Length > 40) // Stay within label array bounds
{ if (Length > 39)
Length = 40; Length = 39;
}
memcpy(Label,CurrentPos,Length); memcpy(Label,CurrentPos,Length);
Label[Length] = '\0'; Label[Length] = '\0';

8
Source/Project64/User Interface/Notification Class.cpp
View File

@ -147,9 +147,11 @@ void CNotification::SetGfxPlugin( CGfxPlugin * Plugin )
void CNotification::SetWindowCaption (const wchar_t * Caption) void CNotification::SetWindowCaption (const wchar_t * Caption)
{ {
wchar_t WinTitle[256]; static const size_t TITLE_SIZE = 256;
_snwprintf( WinTitle, sizeof(WinTitle), L"%s - %s", Caption, g_Settings->LoadString(Setting_ApplicationName).ToUTF16().c_str());
WinTitle[sizeof(WinTitle) - 1] = 0; wchar_t WinTitle[TITLE_SIZE];
_snwprintf(WinTitle, TITLE_SIZE, L"%s - %s", Caption, g_Settings->LoadString(Setting_ApplicationName).ToUTF16().c_str());
WinTitle[TITLE_SIZE - 1] = 0;
m_hWnd->Caption(WinTitle); m_hWnd->Caption(WinTitle);
} }