From 0c0f123a083a60fc508b52e995f8ffd5366ea277 Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Mon, 1 Jun 2015 13:52:55 +0900 Subject: [PATCH] Use wmemcpy() rather than memcpy() and sizeof(wchar_t). --- taglib/toolkit/tstring.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp index 0dbbd910..15db518d 100644 --- a/taglib/toolkit/tstring.cpp +++ b/taglib/toolkit/tstring.cpp @@ -750,7 +750,7 @@ void String::copyFromUTF8(const char *s, size_t length) { d->data.resize(length); - if(length > 0) { + if(length > 0) { const size_t len = UTF8toUTF16(s, length, &d->data[0], d->data.size()); d->data.resize(len); } @@ -782,7 +782,7 @@ void String::copyFromUTF16(const wchar_t *s, size_t length, Type t) d->data[i] = Utils::byteSwap(static_cast(s[i])); } else { - ::memcpy(&d->data[0], s, length * sizeof(wchar_t)); + ::wmemcpy(&d->data[0], s, length); } } }