mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 20:09:04 +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

104
src/css/css_parser.zig
View File

@@ -1423,13 +1423,13 @@ pub const BundlerAtRuleParser = struct {
.loc = bun.logger.Loc{ .start = @intCast(start_position) },
.len = @intCast(end_position - start_position),
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
}
pub fn onLayerRule(this: *This, layers: *const bun.css.SmallList(LayerName, 1)) void {
if (this.anon_layer_count > 0) return;
this.layer_names.ensureUnusedCapacity(this.allocator, layers.len()) catch bun.outOfMemory();
bun.handleOom(this.layer_names.ensureUnusedCapacity(this.allocator, layers.len()));
for (layers.slice()) |*layer| {
if (this.enclosing_layer.v.len() > 0) {
@@ -1439,9 +1439,9 @@ pub const BundlerAtRuleParser = struct {
cloned.v.ensureTotalCapacity(this.allocator, this.enclosing_layer.v.len() + layer.v.len());
cloned.v.appendSliceAssumeCapacity(this.enclosing_layer.v.slice());
cloned.v.appendSliceAssumeCapacity(layer.v.slice());
this.layer_names.push(this.allocator, cloned) catch bun.outOfMemory();
bun.handleOom(this.layer_names.push(this.allocator, cloned));
} else {
this.layer_names.push(this.allocator, layer.deepClone(this.allocator)) catch bun.outOfMemory();
bun.handleOom(this.layer_names.push(this.allocator, layer.deepClone(this.allocator)));
}
}
}
@@ -1828,7 +1828,7 @@ pub fn TopLevelRuleParser(comptime AtRuleParserT: type) type {
AtRuleParserT.CustomAtRuleParser.onImportRule(this.at_rule_parser, &import_rule, @intCast(start.position), @intCast(start.position + 1));
this.rules.v.append(this.allocator, .{
.import = import_rule,
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.namespace => {
@@ -1843,7 +1843,7 @@ pub fn TopLevelRuleParser(comptime AtRuleParserT: type) type {
.url = url,
.loc = loc,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
@@ -1860,7 +1860,7 @@ pub fn TopLevelRuleParser(comptime AtRuleParserT: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.layer => {
@@ -1882,7 +1882,7 @@ pub fn TopLevelRuleParser(comptime AtRuleParserT: type) type {
.prelude = prelude2,
.block = null,
.loc = loc,
} }) catch bun.outOfMemory();
} }) catch |err| bun.handleOom(err);
return .success;
},
.custom => {
@@ -2213,7 +2213,7 @@ pub fn NestedRuleParser(comptime T: type) type {
properties.append(
input.allocator(),
decl,
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
}
}
@@ -2225,7 +2225,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.font_palette_values => {
@@ -2237,7 +2237,7 @@ pub fn NestedRuleParser(comptime T: type) type {
this.rules.v.append(
input.allocator(),
.{ .font_palette_values = rule },
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.counter_style => {
@@ -2254,7 +2254,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.media => {
@@ -2272,7 +2272,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.supports => {
@@ -2287,7 +2287,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.rules = rules,
.loc = loc,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.container => {
@@ -2305,7 +2305,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.scope => {
@@ -2323,7 +2323,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.viewport => {
@@ -2336,7 +2336,7 @@ pub fn NestedRuleParser(comptime T: type) type {
},
.loc = loc,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.keyframes => {
@@ -2350,7 +2350,7 @@ pub fn NestedRuleParser(comptime T: type) type {
keyframes.append(
input.allocator(),
keyframe,
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
}
}
@@ -2361,7 +2361,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.vendor_prefix = prelude.keyframes.prefix,
.loc = loc,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.page => {
@@ -2373,7 +2373,7 @@ pub fn NestedRuleParser(comptime T: type) type {
this.rules.v.append(
input.allocator(),
.{ .page = rule },
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.moz_document => {
@@ -2386,7 +2386,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.rules = rules,
.loc = loc,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.layer => {
@@ -2414,7 +2414,7 @@ pub fn NestedRuleParser(comptime T: type) type {
this.rules.v.append(input.allocator(), .{
.layer_block = css_rules.layer.LayerBlockRule(T.CustomAtRuleParser.AtRule){ .name = name, .rules = rules, .loc = loc },
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.property => {
@@ -2424,7 +2424,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.err => |e| return .{ .err = e },
.result => |v| v,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
.import, .namespace, .custom_media, .charset => {
@@ -2444,7 +2444,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.nest => {
@@ -2469,7 +2469,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.font_feature_values => bun.unreachablePanic("", .{}),
@@ -2487,7 +2487,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.custom => {
@@ -2499,7 +2499,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.result => |v| v,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
}
@@ -2523,7 +2523,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.unknown => {
@@ -2537,7 +2537,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.loc = loc,
},
},
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
return .success;
},
.custom => {
@@ -2551,7 +2551,7 @@ pub fn NestedRuleParser(comptime T: type) type {
)) {
.err => |e| return .{ .err = e },
.result => |v| v,
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
},
else => return .{ .err = {} },
@@ -2631,7 +2631,7 @@ pub fn NestedRuleParser(comptime T: type) type {
const custom_properties_slice = custom_properties.slice();
for (this.composes_refs.slice()) |ref| {
const entry = this.local_properties.getOrPut(this.allocator, ref) catch bun.outOfMemory();
const entry = bun.handleOom(this.local_properties.getOrPut(this.allocator, ref));
const property_usage: *PropertyUsage = if (!entry.found_existing) brk: {
entry.value_ptr.* = PropertyUsage{ .range = bun.logger.Range{ .loc = bun.logger.Loc{ .start = @intCast(location) }, .len = @intCast(len) } };
break :brk entry.value_ptr;
@@ -2648,7 +2648,7 @@ pub fn NestedRuleParser(comptime T: type) type {
.rules = rules,
.loc = loc,
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .success;
}
@@ -2684,11 +2684,11 @@ pub fn NestedRuleParser(comptime T: type) type {
/// for the bundler so we can generate the lazy JS import object later.
pub fn recordComposes(this: *This, allocator: Allocator, composes: *Composes) void {
for (this.composes_refs.slice()) |ref| {
const entry = this.composes.getOrPut(allocator, ref) catch bun.outOfMemory();
const entry = bun.handleOom(this.composes.getOrPut(allocator, ref));
if (!entry.found_existing) {
entry.value_ptr.* = ComposesEntry{};
}
entry.value_ptr.*.composes.push(allocator, composes.deepClone(allocator)) catch bun.outOfMemory();
bun.handleOom(entry.value_ptr.*.composes.push(allocator, composes.deepClone(allocator)));
}
}
@@ -2727,7 +2727,7 @@ pub fn NestedRuleParser(comptime T: type) type {
errors.append(
this.allocator,
e,
) catch bun.outOfMemory();
) catch |err| bun.handleOom(err);
} else {
if (iter.parser.options.error_recovery) {
iter.parser.options.warn(e);
@@ -3017,7 +3017,7 @@ pub fn fillPropertyBitSet(allocator: Allocator, bitset: *PropertyBitset, block:
for (block.declarations.items) |*prop| {
const tag = switch (prop.*) {
.custom => {
custom_properties.push(allocator, prop.custom.name.asStr()) catch bun.outOfMemory();
bun.handleOom(custom_properties.push(allocator, prop.custom.name.asStr()));
continue;
},
.unparsed => |u| @as(PropertyIdTag, u.property_id),
@@ -3030,7 +3030,7 @@ pub fn fillPropertyBitSet(allocator: Allocator, bitset: *PropertyBitset, block:
for (block.important_declarations.items) |*prop| {
const tag = switch (prop.*) {
.custom => {
custom_properties.push(allocator, prop.custom.name.asStr()) catch bun.outOfMemory();
bun.handleOom(custom_properties.push(allocator, prop.custom.name.asStr()));
continue;
},
.unparsed => |u| @as(PropertyIdTag, u.property_id),
@@ -3100,7 +3100,7 @@ pub fn StyleSheet(comptime AtRule: type) type {
for (this.rules.v.items) |*rule| {
if (rule.* == .custom_media) {
custom_media.put(allocator, rule.custom_media.name.v, rule.custom_media.deepClone(allocator)) catch bun.outOfMemory();
bun.handleOom(custom_media.put(allocator, rule.custom_media.name.v, rule.custom_media.deepClone(allocator)));
}
}
@@ -3285,7 +3285,7 @@ pub fn StyleSheet(comptime AtRule: type) type {
.whitespace => {},
.comment => |comment| {
if (bun.strings.startsWithChar(comment, '!')) {
license_comments.append(allocator, comment) catch bun.outOfMemory();
bun.handleOom(license_comments.append(allocator, comment));
}
},
else => break,
@@ -3311,9 +3311,9 @@ pub fn StyleSheet(comptime AtRule: type) type {
}
var sources = ArrayList([]const u8){};
sources.append(allocator, options.filename) catch bun.outOfMemory();
bun.handleOom(sources.append(allocator, options.filename));
var source_map_urls = ArrayList(?[]const u8){};
source_map_urls.append(allocator, parser.currentSourceMapUrl()) catch bun.outOfMemory();
bun.handleOom(source_map_urls.append(allocator, parser.currentSourceMapUrl()));
return .{
.result = .{
@@ -3410,7 +3410,7 @@ pub fn StyleSheet(comptime AtRule: type) type {
var count: u32 = 0;
inline for (STATES[0..]) |state| {
if (comptime state == .exec) {
out.v.ensureUnusedCapacity(allocator, count) catch bun.outOfMemory();
bun.handleOom(out.v.ensureUnusedCapacity(allocator, count));
}
var saw_imports = false;
for (this.rules.v.items) |*rule| {
@@ -3430,7 +3430,7 @@ pub fn StyleSheet(comptime AtRule: type) type {
.path = bun.fs.Path.init(import_rule.url),
.kind = if (import_rule.supports != null) .at_conditional else .at,
.range = bun.logger.Range.None,
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
rule.* = .ignored;
},
}
@@ -3469,7 +3469,7 @@ pub const StyleAttribute = struct {
&parser_extra,
);
const sources = sources: {
var s = ArrayList([]const u8).initCapacity(allocator, 1) catch bun.outOfMemory();
var s = bun.handleOom(ArrayList([]const u8).initCapacity(allocator, 1));
s.appendAssumeCapacity(options.filename);
break :sources s;
};
@@ -3790,7 +3790,7 @@ const ParseUntilErrorBehavior = enum {
// return switch (this.*) {
// .list => |list| {
// const len = list.len;
// list.push(allocator, record) catch bun.outOfMemory();
// bun.handleOom(list.push(allocator, record));
// return len;
// },
// // .dummy => |*d| {
@@ -3826,7 +3826,7 @@ pub const Parser = struct {
const extra = this.extra.?;
const entry = extra.local_scope.getOrPut(this.allocator(), name) catch bun.outOfMemory();
const entry = bun.handleOom(extra.local_scope.getOrPut(this.allocator(), name));
if (!entry.found_existing) {
entry.value_ptr.* = LocalEntry{
.ref = CssRef{
@@ -3838,7 +3838,7 @@ pub const Parser = struct {
extra.symbols.push(this.allocator(), bun.ast.Symbol{
.kind = .local_css,
.original_name = name,
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
} else {
const prev_tag = entry.value_ptr.ref.tag;
if (!prev_tag.class and tag.class) {
@@ -3861,7 +3861,7 @@ pub const Parser = struct {
.loc = bun.logger.Loc{ .start = @intCast(start_position) },
.len = @intCast(url.len), // TODO: technically this is not correct because the url could be escaped
},
}) catch bun.outOfMemory();
}) catch |err| bun.handleOom(err);
return .{ .result = idx };
} else {
return .{ .err = this.newBasicUnexpectedTokenError(.{ .unquoted_url = url }) };
@@ -3992,7 +3992,7 @@ pub const Parser = struct {
.err => {
// need to clone off the stack
const needs_clone = values.items.len == 1;
if (needs_clone) return .{ .result = values.clone(this.allocator()) catch bun.outOfMemory() };
if (needs_clone) return .{ .result = bun.handleOom(values.clone(this.allocator())) };
return .{ .result = values };
},
};
@@ -6451,13 +6451,13 @@ const CopyOnWriteStr = union(enum) {
pub fn append(this: *@This(), allocator: Allocator, slice: []const u8) void {
switch (this.*) {
.borrowed => {
var list = std.ArrayList(u8).initCapacity(allocator, this.borrowed.len + slice.len) catch bun.outOfMemory();
var list = bun.handleOom(std.ArrayList(u8).initCapacity(allocator, this.borrowed.len + slice.len));
list.appendSliceAssumeCapacity(this.borrowed);
list.appendSliceAssumeCapacity(slice);
this.* = .{ .owned = list };
},
.owned => {
this.owned.appendSlice(slice) catch bun.outOfMemory();
bun.handleOom(this.owned.appendSlice(slice));
},
}
}
@@ -7108,7 +7108,7 @@ pub inline fn copysign(self: f32, sign: f32) f32 {
}
pub fn deepClone(comptime V: type, allocator: Allocator, list: *const ArrayList(V)) ArrayList(V) {
var newlist = ArrayList(V).initCapacity(allocator, list.items.len) catch bun.outOfMemory();
var newlist = bun.handleOom(ArrayList(V).initCapacity(allocator, list.items.len));
for (list.items) |*item| {
newlist.appendAssumeCapacity(generic.deepClone(V, item, allocator));