From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 19 Jun 2012 00:43:21 +0000 (-0400)
Subject: fix iconv dest utf-16: unavailable chars must be replaced; EILSEQ is wrong
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=673633c689989c5cb7ba0b919f8ef82c4041e2ec

fix iconv dest utf-16: unavailable chars must be replaced; EILSEQ is wrong
---

diff --git a/src/locale/iconv.c b/src/locale/iconv.c
index c48e45aa..78c215e1 100644
--- a/src/locale/iconv.c
+++ b/src/locale/iconv.c
@@ -327,14 +327,14 @@ size_t iconv(iconv_t cd0, char **in, size_t *inb, char **out, size_t *outb)
 		case UCS2LE:
 		case UTF_16BE:
 		case UTF_16LE:
-			if (c < 0x10000) {
+			if (c < 0x10000 || type-UCS2BE < 2U) {
+				if (c >= 0x10000) c = 0xFFFD;
 				if (*outb < 2) goto toobig;
 				put_16((void *)*out, c, totype);
 				*out += 2;
 				*outb -= 2;
 				break;
 			}
-			if (type-UCS2BE < 2U) goto ilseq;
 			if (*outb < 4) goto toobig;
 			c -= 0x10000;
 			put_16((void *)*out, (c>>10)|0xd800, totype);