diff options
author | Johannes Schickel | 2013-08-08 03:55:02 +0200 |
---|---|---|
committer | Johannes Schickel | 2013-08-12 01:33:29 +0200 |
commit | f7d3b0671124dba28541c56fb74edd535fdad386 (patch) | |
tree | a2d332943e99fd930903b7fb7e14733248a34d87 | |
parent | 774d53045dd92ec36f6a6c13eb9771ea3eb5c491 (diff) | |
download | scummvm-rg350-f7d3b0671124dba28541c56fb74edd535fdad386.tar.gz scummvm-rg350-f7d3b0671124dba28541c56fb74edd535fdad386.tar.bz2 scummvm-rg350-f7d3b0671124dba28541c56fb74edd535fdad386.zip |
COMMON: Get rid of write version of ConfigManager::getGameDomains.
This can be abused to insert Domains into the game domains without any checks.
Instead, only write iterator access is given.
-rw-r--r-- | base/commandLine.cpp | 5 | ||||
-rw-r--r-- | common/config-manager.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index a39c748adc..a032f37a25 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -827,9 +827,8 @@ void upgradeTargets() { printf("Upgrading all your existing targets\n"); - Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains(); - Common::ConfigManager::DomainMap::iterator iter = domains.begin(); - for (iter = domains.begin(); iter != domains.end(); ++iter) { + Common::ConfigManager::DomainMap::iterator iter = ConfMan.beginGameDomains(); + for (; iter != ConfMan.endGameDomains(); ++iter) { Common::ConfigManager::Domain &dom = iter->_value; Common::String name(iter->_key); Common::String gameid(dom.getVal("gameid")); diff --git a/common/config-manager.h b/common/config-manager.h index d79f647fe3..31966cd05d 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -162,7 +162,8 @@ public: bool hasMiscDomain(const String &domName) const; 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 void copyFrom(ConfigManager &source); |