Skip to content

glob: fix allocator mismatch in finalize and remove dead code #29381

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
alii merged 1 commit into from
Apr 17, 2026
+6 −25
Merged

glob: fix allocator mismatch in finalize and remove dead code #29381

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
27 changes: 4 additions & 23 deletions src/bun.js/api/glob.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ pub const fromJS = js.fromJS;
pub const fromJSDirect = js.fromJSDirect;

pattern: []const u8,
pattern_codepoints: ?std.array_list.Managed(u32) = null,
has_pending_activity: std.atomic.Value(usize) = std.atomic.Value(usize).init(0),

const ScanOpts = struct {
Expand Down Expand Up @@ -261,8 +260,6 @@ fn makeGlobWalker(
}

pub fn constructor(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!*Glob {
const alloc = bun.default_allocator;

const arguments_ = callframe.arguments_old(1);
var arguments = jsc.CallFrame.ArgumentsSlice.init(globalThis.bunVM(), arguments_.slice());
defer arguments.deinit();
Expand All @@ -274,23 +271,16 @@ pub fn constructor(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) b
return globalThis.throw("Glob.constructor: first argument is not a string", .{});
}

const pat_str: []u8 = @constCast((try pat_arg.toSliceClone(globalThis)).slice());
const pat_str: []const u8 = (try pat_arg.toSliceClone(globalThis)).slice();

const glob = bun.handleOom(alloc.create(Glob));
glob.* = .{ .pattern = pat_str };

return glob;
return bun.new(Glob, .{ .pattern = pat_str });
}

pub fn finalize(
this: *Glob,
) callconv(.c) void {
const alloc = jsc.VirtualMachine.get().allocator;
alloc.free(this.pattern);
if (this.pattern_codepoints) |*codepoints| {
codepoints.deinit();
}
alloc.destroy(this);
bun.default_allocator.free(this.pattern);
bun.destroy(this);
}

pub fn hasPendingActivity(this: *Glob) callconv(.c) bool {
Expand Down Expand Up @@ -376,14 +366,6 @@ pub fn match(this: *Glob, globalThis: *JSGlobalObject, callframe: *jsc.CallFrame
return jsc.JSValue.jsBoolean(bun.glob.match(this.pattern, str.slice()).matches());
}

pub fn convertUtf8(codepoints: *std.array_list.Managed(u32), pattern: []const u8) !void {
const iter = CodepointIterator.init(pattern);
var cursor = CodepointIterator.Cursor{};
while (iter.next(&cursor)) {
try codepoints.append(@intCast(cursor.c));
}
}

const string = []const u8;

const ResolvePath = @import("../../resolver/resolve_path.zig");
Expand All @@ -394,7 +376,6 @@ const Arena = std.heap.ArenaAllocator;

const bun = @import("bun");
const BunString = bun.String;
const CodepointIterator = bun.strings.UnsignedCodepointIterator;
const GlobWalker = bun.glob.BunGlobWalker;

const jsc = bun.jsc;
Expand Down
4 changes: 2 additions & 2 deletions src/glob/GlobWalker.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ pub fn GlobWalker_(
);
}

pub fn debugPatternComopnents(this: *GlobWalker) void {
pub fn debugPatternComponents(this: *GlobWalker) void {
const pattern = this.pattern;
const components = &this.patternComponents;
const ptr = @intFromPtr(this);
Expand Down Expand Up @@ -1148,7 +1148,7 @@ pub fn GlobWalker_(
this.arena = arena.*;

if (bun.Environment.allow_assert) {
this.debugPatternComopnents();
this.debugPatternComponents();
}

return .success;
Expand Down
Loading