From a2f149b5d183a842487cc7c76d63511b67db32f5 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 18 Jun 2012 20:29:41 -0400 Subject: [PATCH] fix erroneous utf-16 encoding with surrogates in iconv apparently this was never tested before. --- src/locale/iconv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/locale/iconv.c b/src/locale/iconv.c index 30a457f3..c48e45aa 100644 --- a/src/locale/iconv.c +++ b/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; -- 2.25.1