4 files changed, 13 insertions, 12 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index a30efbc6a..5b9472006 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -59,6 +59,7 @@ static std::string generate_log_filename(const char *base)
     strcpy(tmp, "unknown");
   else
     strftime(tmp, sizeof(tmp), "%Y-%m-%d-%H-%M-%S", &tm);
+  tmp[sizeof(tmp) - 1] = 0;
   filename += "-";
   filename += tmp;
   return filename;
diff --git a/contrib/epee/src/network_throttle-detail.cpp b/contrib/epee/src/network_throttle-detail.cpp
index 317dde8e0..ed6bc07ed 100644
--- a/contrib/epee/src/network_throttle-detail.cpp
+++ b/contrib/epee/src/network_throttle-detail.cpp
@@ -231,8 +231,10 @@ network_time_seconds network_throttle::get_sleep_time_after_tick(size_t packet_s
 }
 
 void network_throttle::logger_handle_net(const std::string &filename, double time, size_t size) {
-    boost::mutex mutex;
-    mutex.lock(); {
+    static boost::mutex mutex;
+
+    boost::lock_guard<boost::mutex> lock(mutex);
+    {
         std::fstream file;
         file.open(filename.c_str(), std::ios::app | std::ios::out );
         file.precision(6);
@@ -240,7 +242,7 @@ void network_throttle::logger_handle_net(const std::string &filename, double tim
             _warn("Can't open file " << filename);
         file << static_cast<int>(time) << " " << static_cast<double>(size/1024) << "\n";
         file.close();
-    }  mutex.unlock();
+    }
 }
 
 // fine tune this to decide about sending speed:
diff --git a/contrib/epee/src/network_throttle.cpp b/contrib/epee/src/network_throttle.cpp
index afacc3e96..dd1640a2e 100644
--- a/contrib/epee/src/network_throttle.cpp
+++ b/contrib/epee/src/network_throttle.cpp
@@ -71,9 +71,6 @@ boost::mutex network_throttle_manager::m_lock_get_global_throttle_in;
 boost::mutex network_throttle_manager::m_lock_get_global_throttle_inreq;
 boost::mutex network_throttle_manager::m_lock_get_global_throttle_out;
 
-int network_throttle_manager::xxx;
-
-
 // ================================================================================================
 // methods:
 i_network_throttle & network_throttle_manager::get_global_throttle_in() { 
diff --git a/contrib/epee/src/wipeable_string.cpp b/contrib/epee/src/wipeable_string.cpp
index 75191df71..894c47bbd 100644
--- a/contrib/epee/src/wipeable_string.cpp
+++ b/contrib/epee/src/wipeable_string.cpp
@@ -85,11 +85,15 @@ void wipeable_string::wipe()
 void wipeable_string::grow(size_t sz, size_t reserved)
 {
   CHECK_AND_ASSERT_THROW_MES(wipefunc, "wipefunc is not set");
-  if (reserved == 0)
+  if (reserved < sz)
     reserved = sz;
-  CHECK_AND_ASSERT_THROW_MES(reserved >= sz, "reserved < sz");
   if (reserved <= buffer.capacity())
+  {
+    if (sz < buffer.size())
+      wipefunc(buffer.data() + sz, buffer.size() - sz);
+    buffer.resize(sz);
     return;
+  }
   size_t old_sz = buffer.size();
   std::unique_ptr<char[]> tmp{new char[old_sz]};
   memcpy(tmp.get(), buffer.data(), old_sz * sizeof(char));
@@ -103,7 +107,7 @@ void wipeable_string::grow(size_t sz, size_t reserved)
 void wipeable_string::push_back(char c)
 {
   grow(size() + 1);
-  buffer.push_back(c);
+  buffer.back() = c;
 }
 
 void wipeable_string::pop_back()
@@ -113,9 +117,6 @@ void wipeable_string::pop_back()
 
 void wipeable_string::resize(size_t sz)
 {
-  CHECK_AND_ASSERT_THROW_MES(wipefunc, "wipefunc is not set");
-  if (sz < buffer.size())
-    wipefunc(buffer.data() + sz, buffer.size() - sz);
   grow(sz);
 }