Defer task destructionbun-v0.7.1

1 files changed, 17 insertions, 1 deletions

diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig
index 82f26261d..a59deb19d 100644
--- a/src/bun.js/event_loop.zig
+++ b/src/bun.js/event_loop.zig
@@ -619,14 +619,30 @@ pub const EventLoop = struct {
 
         this.tasks.ensureUnusedCapacity(count) catch unreachable;
         var writable = this.tasks.writableSlice(0);
+
+        // Defer destruction of the ConcurrentTask to avoid issues with pointer aliasing
+        var to_destroy: ?*ConcurrentTask = null;
+
         while (iter.next()) |task| {
+            if (to_destroy) |dest| {
+                bun.default_allocator.destroy(dest);
+                to_destroy = null;
+            }
+
+            if (task.auto_delete) {
+                to_destroy = task;
+            }
+
             writable[0] = task.task;
             writable = writable[1..];
             this.tasks.count += 1;
-            if (task.auto_delete) bun.default_allocator.destroy(task);
             if (writable.len == 0) break;
         }
 
+        if (to_destroy) |dest| {
+            bun.default_allocator.destroy(dest);
+        }
+
         return this.tasks.count - start_count;
     }