Skip to content

[Fizz Node] Fix null bytes written at text chunk boundaries #26228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 24, 2023
Merged

[Fizz Node] Fix null bytes written at text chunk boundaries #26228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c6553
[Fizz Node] Fix null bytes written at text chunk boundaries
sophiebits Feb 24, 2023
ba8b1d2
Figured out how to write a test that should work OK
sophiebits Feb 24, 2023
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
13 changes: 13 additions & 0 deletions packages/react-dom/src/__tests__/ReactDOMFizzServerNode-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,4 +635,17 @@ describe('ReactDOMFizzServerNode', () => {
expect(rendered).toBe(false);
expect(isComplete).toBe(true);
});

it('should encode multibyte characters correctly without nulls (#24985)', () => {
const {writable, output} = getTestWritable();
const {pipe} = ReactDOMFizzServer.renderToPipeableStream(
<div>{Array(700).fill('ののの')}</div>,
);
pipe(writable);
jest.runAllTimers();
expect(output.result.indexOf('\u0000')).toBe(-1);
expect(output.result).toEqual(
'<div>' + Array(700).fill('ののの').join('<!-- -->') + '</div>',
);
});
});
8 changes: 5 additions & 3 deletions packages/react-server/src/ReactServerStreamConfigNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,14 @@ function writeStringChunk(destination: Destination, stringChunk: string) {
writtenBytes += written;

if (read < stringChunk.length) {
writeToDestination(destination, (currentView: any));
writeToDestination(
destination,
(currentView: any).subarray(0, writtenBytes),
);
currentView = new Uint8Array(VIEW_SIZE);
writtenBytes = textEncoder.encodeInto(
stringChunk.slice(read),
// $FlowFixMe[incompatible-call] found when upgrading Flow
currentView,
(currentView: any),
).written;
}

Expand Down