SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PIString::fromUTF8 BOM support

Browse Source
This commit is contained in:
Пелипенко Иван
2022-11-01 14:29:07 +03:00
parent ca403ca2c7
commit 4219372e68
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/main/core/pistring.cpp
View File

@@ -341,14 +341,31 @@ PIString PIString::fromSystem(const char * s) {
PIString PIString::fromUTF8(const char * s) { PIString PIString::fromUTF8(const char * s) {
PIString ret; PIString ret;
if (!s) return ret; if (!s) return ret;
if (s[0] != '\0') ret.appendFromChars(s, -1, __utf8name__); if (s[0] != '\0') {
if ((uchar)s[0] == 0xEF && (uchar)s[1] == 0xBB && (uchar)s[2] == 0xBF) {
s += 3;
if (s[0] == '\0') return ret;
}
ret.appendFromChars(s, -1, __utf8name__);
}
return ret; return ret;
} }
PIString PIString::fromUTF8(const PIByteArray & ba) { PIString PIString::fromUTF8(const PIByteArray & ba) {
PIString ret; PIString ret;
if (ba.isNotEmpty()) ret.appendFromChars((const char*)ba.data(), ba.size(), __utf8name__); if (ba.isNotEmpty()) {
const char * data = (const char*)ba.data();
int size = ba.size();
if (ba.size() >= 3) {
if (ba[0] == 0xEF && ba[1] == 0xBB && ba[2] == 0xBF) {
data += 3;
size -= 3;
if (size == 0) return ret;
}
}
ret.appendFromChars(data, size, __utf8name__);
}
return ret; return ret;
} }