piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

State: Don't use memcpy and memcmp with strings

Browse Source
This commit is contained in:
JosJuice
2015-11-27 17:36:34 +01:00
parent 5a1729877e
commit 2b0bdc361f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/State.cpp
View File

@ -343,7 +343,7 @@ static void CompressAndDumpState(CompressAndDumpState_args save_args)
// Setting up the header // Setting up the header
StateHeader header; StateHeader header;
memcpy(header.gameID, SConfig::GetInstance().GetUniqueID().c_str(), 6); strncpy((char*)header.gameID, SConfig::GetInstance().GetUniqueID().c_str(), 6);
header.size = g_use_compression ? (u32)buffer_size : 0; header.size = g_use_compression ? (u32)buffer_size : 0;
header.time = Common::Timer::GetDoubleTime(); header.time = Common::Timer::GetDoubleTime();
@ -474,7 +474,7 @@ static void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_
StateHeader header; StateHeader header;
f.ReadArray(&header, 1); f.ReadArray(&header, 1);
if (memcmp(SConfig::GetInstance().GetUniqueID().c_str(), header.gameID, 6)) if (strncmp(SConfig::GetInstance().GetUniqueID().c_str(), (char*)header.gameID, 6))
{ {
Core::DisplayMessage(StringFromFormat("State belongs to a different game (ID %.*s)", Core::DisplayMessage(StringFromFormat("State belongs to a different game (ID %.*s)",
6, header.gameID), 2000); 6, header.gameID), 2000);