Fix mapgen using unitialised height map values

[oweals/minetest.git] / src / ban.cpp

diff --git a/src/ban.cpp b/src/ban.cpp
index 7fa8eb058efbb21c95637ce3475cad72297b7496..55d9b22feea47cca3a986f9a4c002d2fa8fdf159 100644 (file)
--- a/src/ban.cpp
+++ b/src/ban.cpp
@@ -1,35 +1,36 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "ban.h"
 #include <fstream>
-#include <jmutexautolock.h>
+#include "jthread/jmutexautolock.h"
 #include <sstream>
 #include <set>
 #include "strfnd.h"
+#include "util/string.h"
 #include "log.h"
+#include "filesys.h"
 
 BanManager::BanManager(const std::string &banfilepath):
                m_banfilepath(banfilepath),
                m_modified(false)
 {
-       m_mutex.Init();
        try{
                load();
        }
@@ -56,18 +57,16 @@ void BanManager::load()
                throw SerializationError("BanManager::load(): Couldn't open file");
        }
        
-       for(;;)
+       while(!is.eof() && is.good())
        {
-               if(is.eof() || is.good() == false)
-                       break;
                std::string line;
                std::getline(is, line, '\n');
                Strfnd f(line);
                std::string ip = trim(f.next("|"));
                std::string name = trim(f.next("|"));
-               if(ip.empty())
-                       continue;
-               m_ips[ip] = name;
+               if(!ip.empty()) {
+                       m_ips[ip] = name;
+               }
        }
        m_modified = false;
 }
@@ -76,20 +75,20 @@ void BanManager::save()
 {
        JMutexAutoLock lock(m_mutex);
        infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
-       std::ofstream os(m_banfilepath.c_str(), std::ios::binary);
-       
-       if(os.good() == false)
-       {
-               infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
-               throw SerializationError("BanManager::load(): Couldn't open file");
-       }
+       std::ostringstream ss(std::ios_base::binary);
 
        for(std::map<std::string, std::string>::iterator
                        i = m_ips.begin();
                        i != m_ips.end(); i++)
        {
-               os<<i->first<<"|"<<i->second<<"\n";
+               ss << i->first << "|" << i->second << "\n";
        }
+
+       if(!fs::safeWriteToFile(m_banfilepath, ss.str())) {
+               infostream<<"BanManager: failed saving to "<<m_banfilepath<<std::endl;
+               throw SerializationError("BanManager::save(): Couldn't write file");
+       }
+
        m_modified = false;
 }
 
@@ -134,22 +133,15 @@ void BanManager::add(const std::string &ip, const std::string &name)
 void BanManager::remove(const std::string &ip_or_name)
 {
        JMutexAutoLock lock(m_mutex);
-       //m_ips.erase(m_ips.find(ip));
-       // Find out all ip-name pairs that match the ip or name
-       std::set<std::string> ips_to_delete;
        for(std::map<std::string, std::string>::iterator
                        i = m_ips.begin();
-                       i != m_ips.end(); i++)
-       {
-               if(i->first == ip_or_name || i->second == ip_or_name)
-                       ips_to_delete.insert(i->first);
-       }
-       // Erase them
-       for(std::set<std::string>::iterator
-                       i = ips_to_delete.begin();
-                       i != ips_to_delete.end(); i++)
+                       i != m_ips.end();)
        {
-               m_ips.erase(*i);
+               if((i->first == ip_or_name) || (i->second == ip_or_name)) {
+                       m_ips.erase(i++);
+               } else {
+                       ++i;
+               }
        }
        m_modified = true;
 }