Fix bug with UTF16 to UTF8 conversion for chars 0x80..0xFF

1998-02-02 11:14:46 +00:00 · 1998-02-02 11:14:46 +00:00 · fdad370c5b
commit fdad370c5b
parent c70ed036c9
1 changed files with 8 additions and 5 deletions
--- a/expat/xmltok/xmltok.c
+++ b/expat/xmltok/xmltok.c
@ -256,12 +256,15 @@ void PREFIX(toUtf8)(const ENCODING *enc, \
    unsigned char hi = GET_HI(from); \
    switch (hi) { \
    case 0: \
-      if (*toP == toLim) { \
-        *fromP = from; \
-	return; \
+      if (lo < 0x80) { \
+        if (*toP == toLim) { \
+          *fromP = from; \
+	  return; \
+        } \
+        *(*toP)++ = lo; \
+        break; \
      } \
-      *(*toP)++ = lo; \
-      break; \
+      /* fall through */ \
    case 0x1: case 0x2: case 0x3: \
    case 0x4: case 0x5: case 0x6: case 0x7: \
      if (toLim -  *toP < 2) { \