thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Get rid of write version of ConfigManager::getGameDomains.

Browse source 
This can be abused to insert Domains into the game domains without any checks.
Instead, only write iterator access is given.
This commit is contained in:
Johannes Schickel 2013-08-08 03:55:02 +02:00
parent 774d53045d
commit f7d3b06711
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
base/commandLine.cpp
View file

@ -827,9 +827,8 @@ void upgradeTargets() {
printf("Upgrading all your existing targets\n"); printf("Upgrading all your existing targets\n");
Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains(); Common::ConfigManager::DomainMap::iterator iter = ConfMan.beginGameDomains();
Common::ConfigManager::DomainMap::iterator iter = domains.begin(); for (; iter != ConfMan.endGameDomains(); ++iter) {
for (iter = domains.begin(); iter != domains.end(); ++iter) {
Common::ConfigManager::Domain &dom = iter->_value; Common::ConfigManager::Domain &dom = iter->_value;
Common::String name(iter->_key); Common::String name(iter->_key);
Common::String gameid(dom.getVal("gameid")); Common::String gameid(dom.getVal("gameid"));

3
common/config-manager.h
View file

@ -162,7 +162,8 @@ public:
bool hasMiscDomain(const String &domName) const; bool hasMiscDomain(const String &domName) const;
const DomainMap & getGameDomains() const { return _gameDomains; } const DomainMap & getGameDomains() const { return _gameDomains; }
DomainMap & getGameDomains() { return _gameDomains; } DomainMap::iterator beginGameDomains() { return _gameDomains.begin(); }
DomainMap::iterator endGameDomains() { return _gameDomains.end(); }
static void defragment(); // move in memory to reduce fragmentation static void defragment(); // move in memory to reduce fragmentation
void copyFrom(ConfigManager &source); void copyFrom(ConfigManager &source);