Skip to content

fix: correct logic bugs in libarchive, s3 credentials, and postgres bindings #25905

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
Jarred-Sumner merged 3 commits into from
Jan 9, 2026
Merged

fix: correct logic bugs in libarchive, s3 credentials, and postgres bindings #25905

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
8ce07b0
fix: correct logic bugs in libarchive, s3 credentials, and postgres b…
dylan-conway Jan 8, 2026
1e9deed
Merge branch 'main' into claude/fix-logic-bugs
Jarred-Sumner Jan 8, 2026
ab44817
test(s3): fix partSize in storage class test
Jan 9, 2026
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
2 changes: 1 addition & 1 deletion src/libarchive/libarchive.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub const BufferReadStream = struct {

const proposed = pos + offset;
const new_pos = @min(@max(proposed, 0), buflen - 1);
this.pos = @as(usize, @intCast(this.pos));
this.pos = @as(usize, @intCast(new_pos));
return new_pos - pos;
}

Expand Down
6 changes: 3 additions & 3 deletions src/s3/credentials.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ pub const S3Credentials = struct {
}

if (try opts.getOptional(globalObject, "pageSize", i64)) |pageSize| {
if (pageSize < MultiPartUploadOptions.MIN_SINGLE_UPLOAD_SIZE and pageSize > MultiPartUploadOptions.MAX_SINGLE_UPLOAD_SIZE) {
if (pageSize < MultiPartUploadOptions.MIN_SINGLE_UPLOAD_SIZE or pageSize > MultiPartUploadOptions.MAX_SINGLE_UPLOAD_SIZE) {
return globalObject.throwRangeError(pageSize, .{
.min = @intCast(MultiPartUploadOptions.MIN_SINGLE_UPLOAD_SIZE),
.max = @intCast(MultiPartUploadOptions.MAX_SINGLE_UPLOAD_SIZE),
Expand All @@ -173,7 +173,7 @@ pub const S3Credentials = struct {
}
}
if (try opts.getOptional(globalObject, "partSize", i64)) |partSize| {
if (partSize < MultiPartUploadOptions.MIN_SINGLE_UPLOAD_SIZE and partSize > MultiPartUploadOptions.MAX_SINGLE_UPLOAD_SIZE) {
if (partSize < MultiPartUploadOptions.MIN_SINGLE_UPLOAD_SIZE or partSize > MultiPartUploadOptions.MAX_SINGLE_UPLOAD_SIZE) {
return globalObject.throwRangeError(partSize, .{
.min = @intCast(MultiPartUploadOptions.MIN_SINGLE_UPLOAD_SIZE),
.max = @intCast(MultiPartUploadOptions.MAX_SINGLE_UPLOAD_SIZE),
Expand All @@ -196,7 +196,7 @@ pub const S3Credentials = struct {
}

if (try opts.getOptional(globalObject, "retry", i32)) |retry| {
if (retry < 0 and retry > 255) {
if (retry < 0 or retry > 255) {
return globalObject.throwRangeError(retry, .{
.min = 0,
.max = 255,
Expand Down
2 changes: 1 addition & 1 deletion src/sql/postgres.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub fn createBinding(globalObject: *jsc.JSGlobalObject) JSValue {
binding.put(
globalObject,
ZigString.static("createConnection"),
jsc.JSFunction.create(globalObject, "createQuery", PostgresSQLConnection.call, 2, .{}),
jsc.JSFunction.create(globalObject, "createConnection", PostgresSQLConnection.call, 2, .{}),
);

return binding;
Expand Down
2 changes: 1 addition & 1 deletion test/js/bun/s3/s3-storage-class.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ describe("s3 - Storage class", () => {
const writer = s3.file("file_from_writer").writer({
storageClass,
queueSize: 10,
partSize: 5 * 1024,
partSize: 5 * 1024 * 1024, // 5MB minimum
});

const bigFile = Buffer.alloc(10 * 1024 * 1024);
Expand Down