buffer: normalize lone "\r" in Blob native line endings · nodejs/node@21e2420 · 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 21e2420

Browse filesBrowse the repository at this point in the historyBrowse files

watilde

authored and

aduh95

committed

buffer: normalize lone "\r" in Blob native line endings

`new Blob(parts, { endings: 'native' })` failed to normalize a standalone carriage return. The replacement regex only matched `\n` and `\r\n`, so a lone `\r` (and runs such as `\r\r`) were left untouched instead of being converted to the platform's native line ending. The WHATWG "convert line endings to native" algorithm requires `\r`, `\n`, and `\r\n` to all be normalized. Match `\r\n` before a lone `\r` so that CRLF collapses to a single native ending. Refs: https://w3c.github.io/FileAPI/#convert-line-endings-to-native Signed-off-by: Daijiro Wachi <daijiro.wachi@gmail.com> PR-URL: #64115 Refs: https://w3c.github.io/FileAPI/#convert-line-endings-to-native Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com>

1 parent 59af7e0 commit 21e2420
Copy full SHA for 21e2420

2 files changed

+19-1Lines changed: 19 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal
  • blob.js
• test/parallel
  • test-blob.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/blob.js‎

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -122,7 +122,7 @@ function getSource(source, endings) {
122	122	source = new Uint8Array(source);
123	123	} else if (!isArrayBufferView(source)) {
124	124	if (endings === 'native')
125		- source = RegExpPrototypeSymbolReplace(/\n|\r\n/g, source, EOL);
	125	+ source = RegExpPrototypeSymbolReplace(/\r\n|\r|\n/g, source, EOL);
126	126	source = enc.encode(source);
127	127	}
128	128

Collapse file

‎test/parallel/test-blob.js‎

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

+18Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -407,6 +407,24 @@ assert.throws(() => new Blob({}), {
407	407	const b = new Blob(['hello\n'], { endings: 'native' });
408	408	assert.strictEqual(b.size, EOL.length + 5);
409	409
	410	+ // The WHATWG "convert line endings to native" algorithm normalizes every
	411	+ // standalone "\r", "\n", and "\r\n" sequence to the native line ending.
	412	+ // Refs: https://w3c.github.io/FileAPI/#convert-line-endings-to-native
	413	+ (async () => {
	414	+ const cases = [
	415	+ ['a\rb', `a${EOL}b`],
	416	+ ['a\nb', `a${EOL}b`],
	417	+ ['a\r\nb', `a${EOL}b`],
	418	+ ['a\r\rb', `a${EOL}${EOL}b`],
	419	+ ['a\n\rb', `a${EOL}${EOL}b`],
	420	+ ['\r\n\r', `${EOL}${EOL}`],
	421	+ ];
	422	+ for (const [input, expected] of cases) {
	423	+ const blob = new Blob([input], { endings: 'native' });
	424	+ assert.strictEqual(await blob.text(), expected);
	425	+ }
	426	+ })().then(common.mustCall());
	427	+
410	428	[1, {}, 'foo'].forEach((endings) => {
411	429	assert.throws(() => new Blob([], { endings }), {
412	430	code: 'ERR_INVALID_ARG_VALUE',

0 commit comments

Comments

0 (0)