cheng/libexpat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UTF-16 to UTF-8 conversion on surrogates.

Browse Source
This commit is contained in:
James Clark 1998-01-22 08:35:51 +00:00
parent 2ec75e44bc
commit 56440b93f3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
expat/xmltok/xmltok.c
View File

@ -250,6 +250,7 @@ void PREFIX(toUtf8)(const ENCODING *enc, \
{ \ { \
const char *from; \ const char *from; \
for (from = *fromP; from != fromLim; from += 2) { \ for (from = *fromP; from != fromLim; from += 2) { \
int plane; \
unsigned char lo2; \ unsigned char lo2; \
unsigned char lo = GET_LO(from); \ unsigned char lo = GET_LO(from); \
unsigned char hi = GET_HI(from); \ unsigned char hi = GET_HI(from); \
@ -277,10 +278,9 @@ void PREFIX(toUtf8)(const ENCODING *enc, \
case 0xD8: case 0xD9: case 0xDA: case 0xDB: \ case 0xD8: case 0xD9: case 0xDA: case 0xDB: \
if (toLim - *toP < 4) \ if (toLim - *toP < 4) \
return; \ return; \
/* IIIIIIWW XXXXXXYY IIIIIIYY YYZZZZZ => */ \ plane = (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \
/* JJJJJJWW JJXXXXXX JJYYYYYY JJZZZZZ */ \ *(*toP)++ = ((plane >> 2) | cval4); \
*(*toP)++ = ((hi & 0x3) | cval4); \ *(*toP)++ = (((lo >> 2) & 0xF) | ((plane & 0x3) << 4) | 0x80); \
*(*toP)++ = ((lo >> 2) | 0x80); \
from += 2; \ from += 2; \
lo2 = GET_LO(from); \ lo2 = GET_LO(from); \
*(*toP)++ = (((lo & 0x3) << 4) \ *(*toP)++ = (((lo & 0x3) << 4) \