buffer: fix backwards incompatibility

4a86803 introduced a backwards incompatibility by accident and was not caught due to an existing test that wasn't strict enough. This commit fixes both the backwards incompatibility and the test. PR-URL: #12439 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Apr 18, 2017 · 7cd0d4f · 7cd0d4f
1 parent 2519757
commit 7cd0d4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -456,10 +456,7 @@ function byteLength(string, encoding) {
         return len >>> 1;
       break;
   }
-  if (mustMatch)
-    throw new TypeError('Unknown encoding: ' + encoding);
-  else
-    return binding.byteLengthUtf8(string);
+  return (mustMatch ? -1 : binding.byteLengthUtf8(string));
 }
 
 Buffer.byteLength = byteLength;

diff --git a/test/parallel/test-buffer-alloc.js b/test/parallel/test-buffer-alloc.js
@@ -885,7 +885,8 @@ assert.throws(() => Buffer.allocUnsafe(8).writeFloatLE(0.0, -1), RangeError);
 }
 
 // Regression test for #5482: should throw but not assert in C++ land.
-assert.throws(() => Buffer.from('', 'buffer'), TypeError);
+assert.throws(() => Buffer.from('', 'buffer'),
+              /^TypeError: "encoding" must be a valid string encoding$/);
 
 // Regression test for #6111. Constructing a buffer from another buffer
 // should a) work, and b) not corrupt the source buffer.