StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(core): split messages on utf8 multibyte character boundary properly

Browse Source 
Fix #4917
This commit is contained in:
Anthony Bilinski 2018-04-11 23:07:05 -07:00
parent 04ecfe3f34
commit 869036f3c6
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/core.cpp
View File

@ -1392,15 +1392,17 @@ QStringList Core::splitMessage(const QString& message, int maxLen)
} }
if (splitPos <= 0) { if (splitPos <= 0) {
constexpr uint8_t firstOfMultiByteMask = 0xC0;
constexpr uint8_t multiByteMask = 0x80;
splitPos = maxLen; splitPos = maxLen;
if (ba_message[splitPos] & 0x80) { // don't split a utf8 character
do { if ((ba_message[splitPos] & multiByteMask) == multiByteMask) {
while ((ba_message[splitPos] & firstOfMultiByteMask) != firstOfMultiByteMask) {
--splitPos; --splitPos;
} while (!(ba_message[splitPos] & 0x40)); }
} }
--splitPos; --splitPos;
} }
splittedMsgs.append(QString{ba_message.left(splitPos + 1)}); splittedMsgs.append(QString{ba_message.left(splitPos + 1)});
ba_message = ba_message.mid(splitPos + 1); ba_message = ba_message.mid(splitPos + 1);
} }