Skip to content

fix: use StringDecoder to handle UTF-8 chunk boundaries in setEncoding #5035

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

Open
398651434 wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

fix: use StringDecoder to handle UTF-8 chunk boundaries in setEncoding #5035

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions lib/api/readable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict'

const assert = require('node:assert')
const { StringDecoder } = require('node:string_decoder')
const { addAbortListener } = require('node:events')
const { Readable } = require('node:stream')
const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = require('../core/errors')
Expand Down Expand Up @@ -326,6 +327,9 @@ class BodyReadable extends Readable {
setEncoding (encoding) {
if (Buffer.isEncoding(encoding)) {
this._readableState.encoding = encoding
if (this[kConsume]) {
this[kConsume].decoder = new StringDecoder(encoding)
}
}
return this
}
Expand Down Expand Up @@ -546,8 +550,14 @@ function consumeEnd (consume, encoding) {
* @returns {void}
*/
function consumePush (consume, chunk) {
consume.length += chunk.length
consume.body.push(chunk)
if (consume.decoder) {
const string = consume.decoder.write(chunk)
consume.length += Buffer.byteLength(string)
consume.body.push(string)
} else {
consume.length += chunk.length
consume.body.push(chunk)
}
}

/**
Expand Down
Loading