[BUG_FIXED] (Author: Dave Brotherstone) Fix UTF-8 (w/o BOM) detection bug.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1092 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
parent
37ffe3c7e1
commit
c866075f58
@ -79,7 +79,7 @@ u78 Utf8_16_Read::utf8_7bits_8bits()
|
|||||||
ASCII7only=0;
|
ASCII7only=0;
|
||||||
if (sx>=endx-1)
|
if (sx>=endx-1)
|
||||||
break;
|
break;
|
||||||
if (!(*sx & 0x1F) || (sx[1]&(0x80+0x40)) != 0x80) {
|
if ((*sx & 0xC0) != 0xC0 || (sx[1]&(0x80+0x40)) != 0x80) {
|
||||||
rv=0; break;
|
rv=0; break;
|
||||||
}
|
}
|
||||||
sx+=2;
|
sx+=2;
|
||||||
@ -89,7 +89,7 @@ u78 Utf8_16_Read::utf8_7bits_8bits()
|
|||||||
ASCII7only=0;
|
ASCII7only=0;
|
||||||
if (sx>=endx-2)
|
if (sx>=endx-2)
|
||||||
break;
|
break;
|
||||||
if (!(*sx & 0xF) || (sx[1]&(0x80+0x40)) != 0x80 || (sx[2]&(0x80+0x40)) != 0x80) {
|
if ((*sx & 0xE0) != 0xE0 || (sx[1]&(0x80+0x40)) != 0x80 || (sx[2]&(0x80+0x40)) != 0x80) {
|
||||||
rv=0; break;
|
rv=0; break;
|
||||||
}
|
}
|
||||||
sx+=3;
|
sx+=3;
|
||||||
|
Loading…
Reference in New Issue
Block a user