mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop assuming that std::wstring has a contiguous and null-terminated buffer.

Browse Source
This commit is contained in:
Tsuda Kageyu 2017-01-30 00:36:38 +09:00
parent 0c45c63943
commit 598ab752bc
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
taglib/toolkit/tstring.cpp
View File

@ -23,8 +23,6 @@
* http://www.mozilla.org/MPL/ *
***************************************************************************/
// This class assumes that std::basic_string<T> has a contiguous and null-terminated buffer.
#include <iostream>
#include <cerrno>
#include <climits>
@ -101,14 +99,12 @@ namespace
}
data.resize(length);
if(length > 0) {
if(swap) {
for(size_t i = 0; i < length; ++i)
data[i] = Utils::byteSwap(static_cast<unsigned short>(s[i]));
}
else {
::wmemcpy(&data[0], s, length);
}
for(size_t i = 0; i < length; ++i) {
unsigned short c = static_cast<unsigned short>(s[i]);
if(swap)
c = Utils::byteSwap(c);
data[i] = c;
}
}