From dfefb05b10e57e01faab0d633fc9538a571a566f Mon Sep 17 00:00:00 2001
From: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Date: Sun, 18 Sep 2022 18:37:55 -0700
Subject: Fix occasional crash with .json()

---
 src/bun.js/webcore/response.zig | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig
index 525a02f22..1028f4aa9 100644
--- a/src/bun.js/webcore/response.zig
+++ b/src/bun.js/webcore/response.zig
@@ -4085,8 +4085,14 @@ pub const Body = struct {
                             promise.asPromise().?.resolve(global, blob.getTextTransfer(global.ref()));
                         },
                         .getJSON => {
-                            promise.asPromise().?.resolve(global, blob.toJSON(global, .share));
+                            const json_value = blob.toJSON(global, .share);
                             blob.detach();
+
+                            if (json_value.isAnyError(global)) {
+                                promise.asPromise().?.reject(global, json_value);
+                            } else {
+                                promise.asPromise().?.resolve(global, json_value);
+                            }
                         },
                         .getArrayBuffer => {
                             promise.asPromise().?.resolve(global, blob.getArrayBufferTransfer(global));
-- 
cgit v1.2.3