buffer: refactor `byteLength` to remove outdated optimizations · nodejs/node@cff14bc · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit cff14bc

Browse filesBrowse the repository at this point in the historyBrowse files

pd4d10

authored

buffer: refactor byteLength to remove outdated optimizations

The third argument `mustMatch` is now outdated, so remove it. Fixes: #38536 PR-URL: #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>

1 parent e520039 commit cff14bc
Copy full SHA for cff14bc

2 files changed

+8-11Lines changed: 8 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib
  • buffer.js
• test/parallel
  • test-buffer-bytelength.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/buffer.js‎

Copy file name to clipboardExpand all lines: lib/buffer.js

+8-9Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
@@ -738,17 +738,16 @@ function byteLength(string, encoding) {
738	738	}
739	739
740	740	const len = string.length;
741		- const mustMatch = (arguments.length > 2 && arguments[2] === true);
742		- if (!mustMatch && len === 0)
	741	+ if (len === 0)
743	742	return 0;
744	743
745		- if (!encoding)
746		- return (mustMatch ? -1 : byteLengthUtf8(string));
747		-
748		- const ops = getEncodingOps(encoding);
749		- if (ops === undefined)
750		- return (mustMatch ? -1 : byteLengthUtf8(string));
751		- return ops.byteLength(string);
	744	+ if (encoding) {
	745	+ const ops = getEncodingOps(encoding);
	746	+ if (ops) {
	747	+ return ops.byteLength(string);
	748	+ }
	749	+ }
	750	+ return byteLengthUtf8(string);
752	751	}
753	752
754	753	Buffer.byteLength = byteLength;

Collapse file

‎test/parallel/test-buffer-bytelength.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-buffer-bytelength.js

-2Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -23,8 +23,6 @@ const vm = require('vm');
23	23	);
24	24	});
25	25
26		- assert.strictEqual(Buffer.byteLength('', undefined, true), -1);
27		-
28	26	assert(ArrayBuffer.isView(new Buffer(10)));
29	27	assert(ArrayBuffer.isView(new SlowBuffer(10)));
30	28	assert(ArrayBuffer.isView(Buffer.alloc(10)));

0 commit comments

Comments

0 (0)