[js] Normalize when encoding as utf8-c8

Raku · Feb 2, 2018 · 63320aa · 63320aa
1 parent 54b8395
commit 63320aa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/vm/js/nqp-runtime/codecs.js b/src/vm/js/nqp-runtime/codecs.js
@@ -213,12 +213,13 @@ class Utf8C8 {
   }
 
   encode(str) {
-    const buf = new Buffer(Buffer.byteLength(str));
+    const normalized = str.normalize('NFC');
+    const buf = new Buffer(Buffer.byteLength(normalized));
     let state = 0;
     let offset = 0;
     let byte = 0;
 
-    for (const c of str) {
+    for (const c of normalized) {
       if (state === 0) {
         if (c === '\u{10FFFD}') {
           state = 1;