mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-17 14:22:01 +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

6
src/sql/mysql/MySQLStatement.zig
View File

@@ -65,7 +65,7 @@ pub fn checkForDuplicateFields(this: *@This()) void {
var seen_numbers = std.ArrayList(u32).init(bun.default_allocator);
defer seen_numbers.deinit();
var seen_fields = bun.StringHashMap(void).init(bun.default_allocator);
seen_fields.ensureUnusedCapacity(@intCast(this.columns.len)) catch bun.outOfMemory();
bun.handleOom(seen_fields.ensureUnusedCapacity(@intCast(this.columns.len)));
defer seen_fields.deinit();
// iterate backwards
@@ -89,7 +89,7 @@ pub fn checkForDuplicateFields(this: *@This()) void {
field.name_or_index = .duplicate;
flags.has_duplicate_columns = true;
} else {
seen_numbers.append(index) catch bun.outOfMemory();
bun.handleOom(seen_numbers.append(index));
}
flags.has_indexed_columns = true;
@@ -118,7 +118,7 @@ pub fn structure(this: *MySQLStatement, owner: JSValue, globalObject: *jsc.JSGlo
nonDuplicatedCount -= 1;
}
}
const ids = if (nonDuplicatedCount <= jsc.JSObject.maxInlineCapacity()) stack_ids[0..nonDuplicatedCount] else bun.default_allocator.alloc(jsc.JSObject.ExternColumnIdentifier, nonDuplicatedCount) catch bun.outOfMemory();
const ids = if (nonDuplicatedCount <= jsc.JSObject.maxInlineCapacity()) stack_ids[0..nonDuplicatedCount] else bun.handleOom(bun.default_allocator.alloc(jsc.JSObject.ExternColumnIdentifier, nonDuplicatedCount));
var i: usize = 0;
for (this.columns) |*column| {