Skip to content
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

Jump to bottom

fix handling of buffer slices #2541

Merged
merged 1 commit into from
Aug 16, 2024
Merged

fix handling of buffer slices #2541

Show file tree
Hide file tree
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
57 changes: 28 additions & 29 deletions src/node/internal/internal_buffer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,47 +755,46 @@ Buffer.prototype.lastIndexOf = function lastIndexOf(
return bidirectionalIndexOf(this, val, byteOffset, encoding, false);
};

Buffer.prototype.asciiSlice = function asciiSlice(offset: number, length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, ASCII);
Buffer.prototype.asciiSlice = function asciiSlice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, ASCII);
};

Buffer.prototype.base64Slice = function base64Slice(offset: number, length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, BASE64);
Buffer.prototype.base64Slice = function base64Slice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, BASE64);
};

Buffer.prototype.base64urlSlice = function base64urlSlice(offset: number, length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, BASE64URL);
Buffer.prototype.base64urlSlice = function base64urlSlice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, BASE64URL);
};

Buffer.prototype.hexSlice = function hexSlice(offset: number, length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, HEX);
Buffer.prototype.hexSlice = function hexSlice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, HEX);
};

Buffer.prototype.latin1Slice = function latin1Slice(offset: number,
length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, LATIN1);
Buffer.prototype.latin1Slice = function latin1Slice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, LATIN1);
};

Buffer.prototype.ucs2Slice = function ucs2Slice(offset: number, length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, UTF16LE);
Buffer.prototype.ucs2Slice = function ucs2Slice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, UTF16LE);
};

Buffer.prototype.utf8Slice = function utf8Slice(offset: number, length: number) {
validateOffset(offset, "offset", 0, this.length);
validateOffset(length, "length", 0, this.length - offset);
return bufferUtil.toString(this, offset, offset + length, UTF8);
Buffer.prototype.utf8Slice = function utf8Slice(start: number, end: number) {
validateOffset(start, "start", 0, this.length);
validateOffset(end, "end", 0, this.length);
return bufferUtil.toString(this, start, end, UTF8);
};

Buffer.prototype.asciiWrite = function asciiWrite(string: StringLike,
Expand Down
1 change: 1 addition & 0 deletions src/workerd/api/node/buffer.c++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ jsg::JsString toStringImpl(
uint32_t start,
uint32_t end,
Encoding encoding) {
if (end < start) end = start;
auto slice = bytes.slice(start, end);
if (slice.size() == 0) return js.str();
switch (encoding) {
Expand Down
10 changes: 10 additions & 0 deletions src/workerd/api/node/tests/buffer-nodejs-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5894,3 +5894,13 @@ export const fileTest = {
}
}
}

// Ref: https://github.com/cloudflare/workerd/issues/2538
export const sliceOffsetLimits = {
test() {
// Make sure the second parameter represents the "end" index, not length.
strictEqual(Buffer.from('abcd').utf8Slice(2, 3).toString(), 'c');
// Make sure to handle (end < start) edge case.
strictEqual(Buffer.from('abcd').utf8Slice(1, 0).toString(), '');
}
}
Loading