aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--src/input/Init.cxx2
-rw-r--r--src/util/HugeAllocator.hxx3
3 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 767e8f41f..9ae7adb66 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ ver 0.20 (not yet released)
ver 0.19.7 (not yet released)
* playlist
- don't skip non-existent songs in "listplaylist"
+* fix memory allocator bug on Windows
ver 0.19.6 (2014/12/08)
* decoder
diff --git a/src/input/Init.cxx b/src/input/Init.cxx
index 5e64dcaed..0ee87c4d8 100644
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@@ -67,7 +67,7 @@ input_stream_global_init(Error &error)
case InputPlugin::InitResult::UNAVAILABLE:
if (error.IsDefined()) {
FormatError(error,
- "Input plugin '%s' is unavailable: ",
+ "Input plugin '%s' is unavailable",
plugin->name);
error.Clear();
}
diff --git a/src/util/HugeAllocator.hxx b/src/util/HugeAllocator.hxx
index e85f936dc..e02e69f10 100644
--- a/src/util/HugeAllocator.hxx
+++ b/src/util/HugeAllocator.hxx
@@ -70,7 +70,8 @@ gcc_malloc
static inline void *
HugeAllocate(size_t size)
{
- return VirtualAlloc(nullptr, size, MEM_LARGE_PAGES, PAGE_READWRITE);
+ // TODO: use MEM_LARGE_PAGES
+ return VirtualAlloc(nullptr, size, MEM_RESERVE, PAGE_READWRITE);
}
static inline void