Permalink
Browse files

buffer: make byteLength throw on invalid input

PR-URL: #8946
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
  • Loading branch information...
mscdex authored and jasnell committed Oct 6, 2016
1 parent 01db04b commit c9dade48b46851cabc9ef3677a55ed1dd038c4a1
Showing with 9 additions and 7 deletions.
  1. +0 −2 doc/api/buffer.md
  2. +1 −1 lib/buffer.js
  3. +8 −4 test/parallel/test-buffer-bytelength.js
View
@@ -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
View
@@ -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;
@@ -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)));

0 comments on commit c9dade4

Please sign in to comment.