summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2017-08-08 19:30:30 +0200
committerMax Kellermann <max@musicpd.org>2017-08-08 19:30:30 +0200
commitfe9ffcb9d20c67aa38e2a119cdd2972d5dc8a43b (patch)
treed617fa064c929f3e8c482a9f7b6d0382d8d8b81c
parentbea5681fd8adbc3536ee82b031970e7861ab90f9 (diff)
parentb0703b92c32d6802c88f00c62274ee5a372eaf1f (diff)
Merge branch 'v0.20.x'
-rw-r--r--NEWS1
-rw-r--r--src/util/FormatString.cxx2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5e8b6febd..cd8da113b 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ ver 0.20.10 (not yet released)
- ffmpeg: support MusicBrainz ID3v2 tags
* tags
- aiff: fix FORM chunk size endianess (is big-endian)
+* fix crash on Windows
ver 0.20.9 (2017/06/04)
* decoder
diff --git a/src/util/FormatString.cxx b/src/util/FormatString.cxx
index ceb7d48e0..57ea57525 100644
--- a/src/util/FormatString.cxx
+++ b/src/util/FormatString.cxx
@@ -57,7 +57,7 @@ FormatStringV(const char *fmt, va_list args) noexcept
const size_t length = strlen(buffer);
char *p = new char[length + 1];
memcpy(p, buffer, length + 1);
- return AllocatedString<>::Donate(buffer);
+ return AllocatedString<>::Donate(p);
#endif
}