mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

Fix crash due to memset to 0 on std::string

Browse Source
This commit is contained in:
Ted John
2016-10-02 19:16:09 +01:00
parent d81bed5ee6
commit 08eb1db6d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/localisation/LanguagePack.cpp
View File

@@ -469,8 +469,8 @@ public:
_objectOverrides.push_back(ObjectOverride());
_currentObjectOverride = &_objectOverrides[_objectOverrides.size() - 1];
memset(_currentObjectOverride, 0, sizeof(ObjectOverride));
memcpy(_currentObjectOverride->name, _currentGroup, 8);
Memory::Set(_currentObjectOverride, 0, sizeof(ObjectOverride));
Memory::Copy(_currentObjectOverride->name, _currentGroup, 8);
}
}
}
@@ -515,8 +515,8 @@ public:
_scenarioOverrides.push_back(ScenarioOverride());
_currentScenarioOverride = &_scenarioOverrides[_scenarioOverrides.size() - 1];
Memory::Set(_currentScenarioOverride, 0, sizeof(ScenarioOverride));
_currentScenarioOverride->filename = std::string(sb.GetBuffer());
Memory::Set(_currentScenarioOverride->strings, 0, sizeof(_currentScenarioOverride->strings));
}
}
}