Browse Source

fix erroneous utf-16 encoding with surrogates in iconv

apparently this was never tested before.
Rich Felker 12 years ago
parent
commit
a2f149b5d1
1 changed files with 1 additions and 0 deletions
  1. 1 0
      src/locale/iconv.c

+ 1 - 0
src/locale/iconv.c

@@ -336,6 +336,7 @@ size_t iconv(iconv_t cd0, char **in, size_t *inb, char **out, size_t *outb)
 			}
 			if (type-UCS2BE < 2U) goto ilseq;
 			if (*outb < 4) goto toobig;
+			c -= 0x10000;
 			put_16((void *)*out, (c>>10)|0xd800, totype);
 			put_16((void *)(*out + 2), (c&0x3ff)|0xdc00, totype);
 			*out += 4;