43 lines
1.4 KiB
Plaintext
43 lines
1.4 KiB
Plaintext
$OpenBSD: patch-src_tools_qstring_cpp,v 1.2 2007/12/28 17:45:04 espie Exp $
|
|
--- src/tools/qstring.cpp.orig Fri Feb 2 15:01:05 2007
|
|
+++ src/tools/qstring.cpp Sun Oct 28 01:16:23 2007
|
|
@@ -5805,6 +5805,7 @@ QString QString::fromUtf8( const char* utf8, int len )
|
|
result.setLength( len ); // worst case
|
|
QChar *qch = (QChar *)result.unicode();
|
|
uint uc = 0;
|
|
+ uint min_uc = 0;
|
|
int need = 0;
|
|
int error = -1;
|
|
uchar ch;
|
|
@@ -5822,6 +5823,12 @@ QString QString::fromUtf8( const char* utf8, int len )
|
|
unsigned short low = uc%0x400 + 0xdc00;
|
|
*qch++ = QChar(high);
|
|
*qch++ = QChar(low);
|
|
+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
|
|
+ // overlong seqence, UTF16 surrogate or BOM
|
|
+ i = error;
|
|
+ qch = addOne(qch, result);
|
|
+ *qch++ = QChar(0xdbff);
|
|
+ *qch++ = QChar(0xde00+((uchar)utf8[i]));
|
|
} else {
|
|
*qch++ = uc;
|
|
}
|
|
@@ -5844,14 +5851,17 @@ QString QString::fromUtf8( const char* utf8, int len )
|
|
uc = ch & 0x1f;
|
|
need = 1;
|
|
error = i;
|
|
+ min_uc = 0x80;
|
|
} else if ((ch & 0xf0) == 0xe0) {
|
|
uc = ch & 0x0f;
|
|
need = 2;
|
|
error = i;
|
|
+ min_uc = 0x800;
|
|
} else if ((ch&0xf8) == 0xf0) {
|
|
uc = ch & 0x07;
|
|
need = 3;
|
|
error = i;
|
|
+ min_uc = 0x10000;
|
|
} else {
|
|
// Error
|
|
qch = addOne(qch, result);
|