aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-12-04 17:30:46 +0200
committerRiccardo Spagni <ric@spagni.net>2018-12-04 17:30:46 +0200
commit16dc6900fb556b61edaba5e323497e9b8c677ae2 (patch)
treea30444d96042a869ba0557d9a7b5091384e143ab /contrib/epee/src
parentMerge pull request #4882 (diff)
parentmlocker: fix access to global lock map after dtor on exit (diff)
downloadmonero-16dc6900fb556b61edaba5e323497e9b8c677ae2.tar.xz
Merge pull request #4883
40485a73 mlocker: fix access to global lock map after dtor on exit (moneromooo-monero)
Diffstat (limited to 'contrib/epee/src')
-rw-r--r--contrib/epee/src/mlocker.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/src/mlocker.cpp b/contrib/epee/src/mlocker.cpp
index 8e24e8438..0b41c36bf 100644
--- a/contrib/epee/src/mlocker.cpp
+++ b/contrib/epee/src/mlocker.cpp
@@ -98,8 +98,8 @@ namespace epee
}
std::map<size_t, unsigned int> &mlocker::map()
{
- static std::map<size_t, unsigned int> vmap;
- return vmap;
+ static std::map<size_t, unsigned int> *vmap = new std::map<size_t, unsigned int>();
+ return *vmap;
}
size_t mlocker::get_page_size()