NOMEM exceptions instead of panic on FileReader

oven-sh · Nov 26, 2024 · 0b1318d · 0b1318d
1 parent 0d6d4fa
commit 0b1318d
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig
@@ -3877,12 +3877,20 @@ pub const FileReader = struct {
                     } else if (in_progress.len > 0 and !hasMore) {
                         this.read_inside_on_pull = .{ .temporary = buf };
                     } else if (hasMore and !bun.isSliceInBuffer(buf, this.buffered.allocatedSlice())) {
-                        this.buffered.appendSlice(bun.default_allocator, buf) catch bun.outOfMemory();
+                        this.buffered.appendSlice(bun.default_allocator, buf) catch {
+                            this.onReaderError(bun.sys.Error.fromCode(.NOMEM, .read));
+                            this.reader.close();
+                            return false;
+                        };
                         this.read_inside_on_pull = .{ .use_buffered = buf.len };
                     }
                 },
                 .use_buffered => |original| {
-                    this.buffered.appendSlice(bun.default_allocator, buf) catch bun.outOfMemory();
+                    this.buffered.appendSlice(bun.default_allocator, buf) catch {
+                        this.onReaderError(bun.sys.Error.fromCode(.NOMEM, .read));
+                        this.reader.close();
+                        return false;
+                    };
                     this.read_inside_on_pull = .{ .use_buffered = buf.len + original };
                 },
                 .none => unreachable,
@@ -3989,7 +3997,11 @@ pub const FileReader = struct {
             this.pending.run();
             return !was_done;
         } else if (!bun.isSliceInBuffer(buf, this.buffered.allocatedSlice())) {
-            this.buffered.appendSlice(bun.default_allocator, buf) catch bun.outOfMemory();
+            this.buffered.appendSlice(bun.default_allocator, buf) catch {
+                this.onReaderError(bun.sys.Error.fromCode(.NOMEM, .read));
+                this.reader.close();
+                return false;
+            };
             if (bun.isSliceInBuffer(buf, this.reader.buffer().allocatedSlice())) {
                 this.reader.buffer().clearRetainingCapacity();
             }