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(BunFile.slice) fix slice when length is greater than the size #5186

Merged
merged 3 commits into from
Sep 14, 2023
Merged

fix(BunFile.slice) fix slice when length is greater than the size #5186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9094e1
check the limits for file, when slicing
cirospaciari Sep 13, 2023
2d6615f
check eof
cirospaciari Sep 13, 2023
543d079
undo test
cirospaciari Sep 13, 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
8 changes: 5 additions & 3 deletions src/bun.js/webcore/blob.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1680,6 +1680,7 @@ pub const Blob = struct {
read_completion: HTTPClient.NetworkThread.Completion = undefined,
read_len: SizeType = 0,
read_off: SizeType = 0,
read_eof: bool = false,
size: SizeType = 0,
buffer: []u8 = undefined,
task: HTTPClient.NetworkThread.Task = undefined,
Expand Down Expand Up @@ -1797,8 +1798,7 @@ pub const Blob = struct {

pub fn onRead(this: *ReadFile, completion: *HTTPClient.NetworkThread.Completion, result: AsyncIO.ReadError!usize) void {
defer this.doReadLoop();

this.read_len = @as(SizeType, @truncate(result catch |err| {
const read_len = @as(SizeType, @truncate(result catch |err| {
if (@hasField(HTTPClient.NetworkThread.Completion, "result")) {
this.errno = AsyncIO.asError(-completion.result);
this.system_error = (bun.sys.Error{
Expand All @@ -1821,6 +1821,8 @@ pub const Blob = struct {
this.read_len = 0;
return;
}));
this.read_eof = read_len == 0;
this.read_len = read_len;
}

fn runAsync(this: *ReadFile, task: *ReadFileTask) void {
Expand Down Expand Up @@ -1930,7 +1932,7 @@ pub const Blob = struct {
this.read_off += this.read_len;
var remain = this.buffer[@min(this.read_off, @as(Blob.SizeType, @truncate(this.buffer.len)))..];

if (remain.len > 0 and this.errno == null) {
if (remain.len > 0 and this.errno == null and !this.read_eof) {
this.doRead();
return;
}
Expand Down
10 changes: 10 additions & 0 deletions test/js/bun/io/bun-write.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,16 @@ it("offset should work #4963", async () => {
expect(contents).toBe("ntents");
});

it("length should be limited by file size #5080", async () => {
const filename = tmpdir() + "/bun.test.offset2.txt";
await Bun.write(filename, "contents");
const file = Bun.file(filename);
const slice = file.slice(2, 1024);
const contents = await slice.text();
expect(contents).toBe("ntents");
expect(contents.length).toBeLessThanOrEqual(file.size);
});

it("#2674", async () => {
const file = path.join(import.meta.dir, "big-stdout.js");

Expand Down
Loading