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

Enforce use string terminate after strncpy call.

This commit is contained in:
RadWolfie 2018-08-08 14:32:11 -05:00
parent dd32032426
commit 91168833f1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Common/Settings.cpp
View File

@ -612,6 +612,7 @@ void Settings::Verify()
// Prevent using an incorrect path from the registry if the debug folders have been moved
char szDebugPath[MAX_PATH];
char szDebugName[MAX_PATH];
unsigned int strLen;
if (m_gui.CxbxDebugMode == DM_FILE) {
@ -626,7 +627,9 @@ void Settings::Verify()
m_gui.CxbxDebugMode = DM_NONE;
}
else {
std::strncpy(szDebugPath, m_gui.szCxbxDebugFile.c_str(), m_gui.szCxbxDebugFile.size() - std::strlen(szDebugName));
strLen = m_gui.szCxbxDebugFile.size() - std::strlen(szDebugName);
std::strncpy(szDebugPath, m_gui.szCxbxDebugFile.c_str(), strLen);
szDebugPath[strLen] = '\0'; // Require to include terminate string.
if(std::experimental::filesystem::exists(szDebugPath) == false) {
m_gui.szCxbxDebugFile = "";
@ -649,7 +652,9 @@ void Settings::Verify()
m_core.KrnlDebugMode = DM_NONE;
}
else {
std::strncpy(szDebugPath, m_core.szKrnlDebug, std::strlen(m_core.szKrnlDebug) - std::strlen(szDebugName));
strLen = std::strlen(m_core.szKrnlDebug) - std::strlen(szDebugName);
std::strncpy(szDebugPath, m_core.szKrnlDebug, strLen);
szDebugPath[strLen] = '\0'; // Require to include terminate string.
if(std::experimental::filesystem::exists(szDebugPath) == false) {
memset(m_core.szKrnlDebug, '\0', MAX_PATH);