Merge branch 'master' into left_right_scroll

silamon · Oct 24, 2019 · 2a46f5f · 2a46f5f
2 parents 1392abb + 080188c
commit 2a46f5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/common/input/TextDecoder.test.ts b/src/common/input/TextDecoder.test.ts
@@ -7,6 +7,7 @@ import { assert } from 'chai';
 import { StringToUtf32, stringFromCodePoint, Utf8ToUtf32, utf32ToString } from 'common/input/TextDecoder';
 import { encode } from 'utf8';
 
+
 // convert UTF32 codepoints to string
 function toString(data: Uint32Array, length: number): string {
   if ((String as any).fromCodePoint) {
@@ -214,6 +215,16 @@ describe('text encodings', () => {
         }
         assert(decoded, 'Ä€𝄞Ö𝄞€Ü𝄞€');
       });
+      it('test break after 3 bytes - issue #2495', () => {
+        const decoder = new Utf8ToUtf32();
+        const target = new Uint32Array(5);
+        const utf8Data = fromByteString('\xf0\xa0\x9c\x8e');
+        let written = decoder.decode(utf8Data.slice(0, 3), target);
+        assert.equal(written, 0);
+        written = decoder.decode(utf8Data.slice(3), target);
+        assert.equal(written, 1);
+        assert(toString(target, written), '𠜎');
+      });
     });
   });
 });
diff --git a/src/common/input/TextDecoder.ts b/src/common/input/TextDecoder.ts
@@ -194,7 +194,7 @@ export class Utf8ToUtf32 {
             target[size++] = cp;
           }
         } else {
-          if (codepoint < 0x010000 || codepoint > 0x10FFFF) {
+          if (cp < 0x010000 || cp > 0x10FFFF) {
             // illegal codepoint
           } else {
             target[size++] = cp;