mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-06 13:18:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

- edvbstring: fix utf8 encoding, thx DboxOldie

Browse Source
This commit is contained in:
max_10
2017-01-22 16:25:58 +01:00
committed by svenhoefer
parent e111bf7418
commit 2f1ceb07e2
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/eitd/edvbstring.cpp
View File

@@ -2305,28 +2305,31 @@ const std::string convertLatin1UTF8(const std::string &string)
int isUTF8(const std::string &string) int isUTF8(const std::string &string)
{ {
unsigned int len=string.size(); unsigned int len=string.size();
unsigned char c;
for (unsigned int i=0; i < len;) for (unsigned int i=0; i < len;)
{ {
int trailing = 0; int trailing = 0;
if (string[i] >> 7 == 0) // 0xxxxxxx c = string[i] & 0xFF;
if (c >> 7 == 0) // 0xxxxxxx
{ {
i++; i++;
continue; continue;
} }
if (string[i] >> 5 == 6) // 110xxxxx 10xxxxxx if (c >> 5 == 6) // 110xxxxx 10xxxxxx
{ {
if (++i >= len) if (++i >= len)
return 0; return 0;
trailing = 1; trailing = 1;
} }
else if (string[i] >> 4 == 14) // 1110xxxx 10xxxxxx 10xxxxxx else if (c >> 4 == 14) // 1110xxxx 10xxxxxx 10xxxxxx
{ {
if (++i >= len) if (++i >= len)
return 0; return 0;
trailing = 2; trailing = 2;
} }
else if ((string[i] >> 3) == 30) // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx else if (c >> 3 == 30) // 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
{ {
if (++i >= len) if (++i >= len)
return 0; return 0;
@@ -2335,7 +2338,7 @@ int isUTF8(const std::string &string)
return 0; return 0;
while (trailing) { while (trailing) {
if (i >= len || string[i] >> 6 != 2) if (i >= len || (string[i] & 0xFF) >> 6 != 2)
return 0; return 0;
trailing--; trailing--;
i++; i++;