buffer: make byteLength throw on invalid input

PR-URL: #8946 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Roman Reiss <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Teddy Katz <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Trevor Norris <[email protected]>
nodejs · Oct 10, 2016 · c9dade4 · c9dade4
1 parent 01db04b
commit c9dade4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/doc/api/buffer.md b/doc/api/buffer.md
@@ -631,8 +631,6 @@ console.log(`${str}: ${str.length} characters, ` +
 When `string` is a `Buffer`/[`DataView`]/[`TypedArray`]/[`ArrayBuffer`], the
 actual byte length is returned.
 
-Otherwise, converts to `String` and returns the byte length of string.
-
 ### Class Method: Buffer.compare(buf1, buf2)
 <!-- YAML
 added: v0.11.13

diff --git a/lib/buffer.js b/lib/buffer.js
@@ -369,7 +369,7 @@ function byteLength(string, encoding) {
       return string.byteLength;
     }
 
-    string = '' + string;
+    throw new TypeError('"string" must be a string, Buffer, or ArrayBuffer');
   }
 
   var len = string.length;

diff --git a/test/parallel/test-buffer-bytelength.js b/test/parallel/test-buffer-bytelength.js
@@ -7,10 +7,14 @@ const SlowBuffer = require('buffer').SlowBuffer;
 const vm = require('vm');
 
 // coerce values to string
-assert.strictEqual(Buffer.byteLength(32, 'latin1'), 2);
-assert.strictEqual(Buffer.byteLength(NaN, 'utf8'), 3);
-assert.strictEqual(Buffer.byteLength({}, 'latin1'), 15);
-assert.strictEqual(Buffer.byteLength(), 9);
+assert.throws(() => { Buffer.byteLength(32, 'latin1'); },
+              '"string" must be a string, Buffer, or ArrayBuffer');
+assert.throws(() => { Buffer.byteLength(NaN, 'utf8'); },
+              '"string" must be a string, Buffer, or ArrayBuffer');
+assert.throws(() => { Buffer.byteLength({}, 'latin1'); },
+              '"string" must be a string, Buffer, or ArrayBuffer');
+assert.throws(() => { Buffer.byteLength(); },
+              '"string" must be a string, Buffer, or ArrayBuffer');
 
 assert(ArrayBuffer.isView(new Buffer(10)));
 assert(ArrayBuffer.isView(new SlowBuffer(10)));