Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions lib/buffer.js
Original file line number Diff line number Diff line change
Expand Up @@ -771,13 +771,22 @@ function byteLength(string, encoding) {
if (len === 0)
return 0;

if (encoding) {
const ops = getEncodingOps(encoding);
if (ops) {
return ops.byteLength(string);
}
if (!encoding || encoding === 'utf8') {
return byteLengthUtf8(string);
}

if (encoding === 'ascii') {
return len;
}
return byteLengthUtf8(string);

const ops = getEncodingOps(encoding);
if (ops === undefined) {
// TODO (ronag): Makes more sense to throw here.
// throw new ERR_UNKNOWN_ENCODING(encoding);
return byteLengthUtf8(string);
}

return ops.byteLength(string);
}

Buffer.byteLength = byteLength;
Expand Down