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

Movie: Better safety when writing to s_revision

This commit is contained in:
JosJuice 2016-05-19 12:29:50 +02:00
parent 2959f3607c
commit a399966751
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/Movie.cpp
View File

@ -2,6 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <mutex> #include <mutex>
#include <mbedtls/config.h> #include <mbedtls/config.h>
#include <mbedtls/md.h> #include <mbedtls/md.h>
@ -1329,12 +1330,16 @@ void GetSettings()
g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
s_memcards |= (SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD) << 0; s_memcards |= (SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD) << 0;
s_memcards |= (SConfig::GetInstance().m_EXIDevice[1] == EXIDEVICE_MEMORYCARD) << 1; s_memcards |= (SConfig::GetInstance().m_EXIDevice[1] == EXIDEVICE_MEMORYCARD) << 1;
unsigned int tmp; unsigned int tmp;
for (size_t i = 0; i < scm_rev_git_str.size() / 2 ; ++i) memset(s_revision, 0, sizeof(s_revision));
size_t revision_bytes_to_copy = std::min(scm_rev_git_str.size() / 2, ArraySize(s_revision));
for (size_t i = 0; i < revision_bytes_to_copy; ++i)
{ {
sscanf(&scm_rev_git_str[2 * i], "%02x", &tmp); sscanf(&scm_rev_git_str[2 * i], "%02x", &tmp);
s_revision[i] = tmp; s_revision[i] = tmp;
} }
if (!s_bDSPHLE) if (!s_bDSPHLE)
{ {
std::string irom_file = File::GetUserPath(D_GCUSER_IDX) + DSP_IROM; std::string irom_file = File::GetUserPath(D_GCUSER_IDX) + DSP_IROM;