From 48bf7d07c10056a678ba9e0bc04f3612b98f5145 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Tue, 24 Nov 2009 16:40:52 -0800
Subject: utf8.c (utf8_from_uc): Fix bug introduced several commits ago
 (porting to C++). Caught by regression test suite. Found using git bisect.

---
 utf8.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'utf8.c')

diff --git a/utf8.c b/utf8.c
index c5c76761..96905b0f 100644
--- a/utf8.c
+++ b/utf8.c
@@ -80,6 +80,7 @@ size_t utf8_from_uc(wchar_t *wdst, const unsigned char *src)
     case utf8_more3:
       if (ch >= 0x80 && ch < 0xc0) {
         wch <<= 6;
+        wch |= (ch & 0x3f);
         state = (enum utf8_state) (state - 1);
         if (state == utf8_init) {
           if (wdst)
-- 
cgit v1.2.3