Mirrors/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-12-28 07:50:41 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

buffer: refactor byteLength to remove outdated optimizations

Browse Source 
The third argument `mustMatch` is now outdated, so remove it.

Fixes: https://github.com/nodejs/node/issues/38536

PR-URL: https://github.com/nodejs/node/pull/38545
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
This commit is contained in:
Rongjian Zhang 2022-03-30 01:48:37 +08:00 committed by GitHub
parent e5200392a2
commit cff14bcaef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/buffer.js
View File

@ -738,17 +738,16 @@ function byteLength(string, encoding) {
}
const len = string.length;
const mustMatch = (arguments.length > 2 && arguments[2] === true);
if (!mustMatch && len === 0)
if (len === 0)
return 0;
if (!encoding)
return (mustMatch ? -1 : byteLengthUtf8(string));
const ops = getEncodingOps(encoding);
if (ops === undefined)
return (mustMatch ? -1 : byteLengthUtf8(string));
return ops.byteLength(string);
if (encoding) {
const ops = getEncodingOps(encoding);
if (ops) {
return ops.byteLength(string);
}
}
return byteLengthUtf8(string);
}
Buffer.byteLength = byteLength;

2
test/parallel/test-buffer-bytelength.js
View File

@ -23,8 +23,6 @@ const vm = require('vm');
);
});
assert.strictEqual(Buffer.byteLength('', undefined, true), -1);
assert(ArrayBuffer.isView(new Buffer(10)));
assert(ArrayBuffer.isView(new SlowBuffer(10)));
assert(ArrayBuffer.isView(Buffer.alloc(10)));