summaryrefslogtreecommitdiff
path: root/Source/Core/Common/IniFile.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2014-06-24 12:28:02 -0500
committerJordan Woyak <jordan.woyak@gmail.com>2014-06-24 12:37:38 -0500
commit516369594f475f93df290d6488c2eccd99618023 (patch)
tree65def7ad054da31588d22835b40f05751887e65e /Source/Core/Common/IniFile.cpp
parent4138702336601b79938889a68144c24c03ccfc14 (diff)
Store ini sections in a std::list (rather than vector) to prevent unexpected pointer invalidation with use of GetOrCreateSection.
Diffstat (limited to 'Source/Core/Common/IniFile.cpp')
-rw-r--r--Source/Core/Common/IniFile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Common/IniFile.cpp b/Source/Core/Common/IniFile.cpp
index 6159c2897d..da9d99e250 100644
--- a/Source/Core/Common/IniFile.cpp
+++ b/Source/Core/Common/IniFile.cpp
@@ -233,7 +233,7 @@ IniFile::Section* IniFile::GetOrCreateSection(const std::string& sectionName)
if (!section)
{
sections.push_back(Section(sectionName));
- section = &sections[sections.size() - 1];
+ section = &sections.back();
}
return section;
}
@@ -323,7 +323,7 @@ bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>*
void IniFile::SortSections()
{
- std::sort(sections.begin(), sections.end());
+ sections.sort();
}
bool IniFile::Load(const std::string& filename, bool keep_current_data)