mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 04:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace catch bun.outOfMemory() with safer alternatives (#22141)

Browse Source 
Replace `catch bun.outOfMemory()`, which can accidentally catch
non-OOM-related errors, with either `bun.handleOom` or a manual `catch
|err| switch (err)`.

(For internal tracking: fixes STAB-1070)

---------

Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
This commit is contained in:
taylor.fish
2025-08-26 12:50:25 -07:00
committed by GitHub
parent 300f486125
commit 437e15bae5
284 changed files with 1835 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/install/PackageManager/WorkspacePackageJSONCache.zig
View File

@@ -49,12 +49,12 @@ pub fn getWithPath(
break :brk buf[0..abs_package_json_path.len];
};
const entry = this.map.getOrPut(allocator, path) catch bun.outOfMemory();
const entry = bun.handleOom(this.map.getOrPut(allocator, path));
if (entry.found_existing) {
return .{ .entry = entry.value_ptr };
}
const key = allocator.dupeZ(u8, path) catch bun.outOfMemory();
const key = bun.handleOom(allocator.dupeZ(u8, path));
entry.key_ptr.* = key;
const source = &(bun.sys.File.toSource(key, allocator, .{}).unwrap() catch |err| {
@@ -85,7 +85,7 @@ pub fn getWithPath(
};
entry.value_ptr.* = .{
.root = json.root.deepClone(bun.default_allocator) catch bun.outOfMemory(),
.root = bun.handleOom(json.root.deepClone(bun.default_allocator)),
.source = source.*,
.indentation = json.indentation,
};
@@ -112,7 +112,7 @@ pub fn getWithSource(
break :brk buf[0..source.path.text.len];
};
const entry = this.map.getOrPut(allocator, path) catch bun.outOfMemory();
const entry = bun.handleOom(this.map.getOrPut(allocator, path));
if (entry.found_existing) {
return .{ .entry = entry.value_ptr };
}
@@ -138,12 +138,12 @@ pub fn getWithSource(
};
entry.value_ptr.* = .{
.root = json.root.deepClone(allocator) catch bun.outOfMemory(),
.root = bun.handleOom(json.root.deepClone(allocator)),
.source = source.*,
.indentation = json.indentation,
};
entry.key_ptr.* = allocator.dupe(u8, path) catch bun.outOfMemory();
entry.key_ptr.* = bun.handleOom(allocator.dupe(u8, path));
return .{ .entry = entry.value_ptr };
}