From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 19 Jun 2012 00:29:41 +0000 (-0400)
Subject: fix erroneous utf-16 encoding with surrogates in iconv
X-Git-Tag: v0.9.2~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2f149b5d183a842487cc7c76d63511b67db32f5;p=oweals%2Fmusl.git

fix erroneous utf-16 encoding with surrogates in iconv

apparently this was never tested before.
---

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;