fix cases, additionally found by tests

ashtuchkin · Jun 22, 2020 · 5175856 · 5175856
1 parent 912a513
commit 5175856
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/encodings/utf16.js b/encodings/utf16.js
@@ -119,6 +119,10 @@ Utf16Decoder.prototype.write = function(buf) {
         if (this.initialBytesLen < 16) // We need more bytes to use space heuristic (see below)
             return '';
 
+        if (!Buffer.isBuffer(buf)) {
+            this.initialBytes = this.initialBytes.map(Buffer.from);
+        }
+
         // We have enough bytes -> detect endianness.
         var buf = Buffer.concat(this.initialBytes),
             encoding = detectEncoding(buf, this.options.defaultEncoding);

diff --git a/encodings/utf32.js b/encodings/utf32.js
@@ -107,6 +107,10 @@ Utf32Decoder.prototype.write = function(src) {
     if (src.length === 0)
         return '';
 
+    if (!Buffer.isBuffer(src)) {
+        src = Buffer.from(src);
+    }
+
     if (this.overflow)
         src = Buffer.concat([this.overflow, src]);
 
@@ -211,6 +215,10 @@ Utf32AutoDecoder.prototype.write = function(buf) {
         if (this.initialBytesLen < 32) // We need more bytes to use space heuristic (see below)
             return '';
 
+        if (!Buffer.isBuffer(buf)) {
+            this.initialBytes = this.initialBytes.map(Buffer.from);
+        }
+
         // We have enough bytes -> detect endianness.
         var buf2 = Buffer.concat(this.initialBytes),
             encoding = detectEncoding(buf2, this.options.defaultEncoding);