Fixes #16277 (#16280)

oven-sh · Jan 9, 2025 · 5e003dc · 5e003dc
1 parent 313bf86
commit 5e003dc
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 9 deletions.
diff --git a/src/bun.js/bindings/ErrorStackTrace.cpp b/src/bun.js/bindings/ErrorStackTrace.cpp
@@ -630,18 +630,23 @@ String sourceURL(const JSC::SourceCode& sourceCode)
     return sourceURL(sourceCode.provider());
 }
 
-String sourceURL(JSC::CodeBlock* codeBlock)
+String sourceURL(JSC::CodeBlock& codeBlock)
 {
-    if (UNLIKELY(!codeBlock)) {
+    if (!codeBlock.ownerExecutable()) {
         return String();
     }
 
-    if (!codeBlock->ownerExecutable()) {
+    const auto& source = codeBlock.source();
+    return sourceURL(source);
+}
+
+String sourceURL(JSC::CodeBlock* codeBlock)
+{
+    if (UNLIKELY(!codeBlock)) {
         return String();
     }
 
-    const auto& source = codeBlock->source();
-    return sourceURL(source);
+    return Zig::sourceURL(*codeBlock);
 }
 
 String sourceURL(JSC::VM& vm, const JSC::StackFrame& frame)
@@ -650,7 +655,7 @@ String sourceURL(JSC::VM& vm, const JSC::StackFrame& frame)
         return "[wasm code]"_s;
     }
 
-    if (UNLIKELY(!frame.codeBlock())) {
+    if (UNLIKELY(!frame.hasLineAndColumnInfo())) {
         return "[native code]"_s;
     }
 
@@ -833,7 +838,8 @@ String functionName(JSC::VM& vm, JSC::JSGlobalObject* lexicalGlobalObject, const
         return functionName;
     }
 
-    if (auto codeblock = frame.codeBlock()) {
+    if (frame.hasLineAndColumnInfo()) {
+        auto* codeblock = frame.codeBlock();
         if (codeblock->isConstructor()) {
             isConstructor = true;
         }

diff --git a/src/bun.js/bindings/ErrorStackTrace.h b/src/bun.js/bindings/ErrorStackTrace.h
@@ -222,6 +222,7 @@ String sourceURL(const JSC::SourceOrigin& origin);
 String sourceURL(JSC::SourceProvider* sourceProvider);
 String sourceURL(const JSC::SourceCode& sourceCode);
 String sourceURL(JSC::CodeBlock* codeBlock);
+String sourceURL(JSC::CodeBlock& codeBlock);
 String sourceURL(JSC::VM& vm, const JSC::StackFrame& frame);
 String sourceURL(JSC::StackVisitor& visitor);
 String sourceURL(JSC::VM& vm, JSC::JSFunction* function);

diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -500,8 +500,10 @@ WTF::String Bun::formatStackTrace(
         JSC::JSGlobalObject* globalObjectForFrame = lexicalGlobalObject;
         if (frame.hasLineAndColumnInfo()) {
             auto* callee = frame.callee();
-            if (auto* object = callee->getObject()) {
-                globalObjectForFrame = object->globalObject();
+            if (callee) {
+                if (auto* object = callee->getObject()) {
+                    globalObjectForFrame = object->globalObject();
+                }
             }
         }
 

diff --git a/test/bun.lockb b/test/bun.lockb
diff --git a/test/js/node/vm/happy-dom-vm-16277.test.ts b/test/js/node/vm/happy-dom-vm-16277.test.ts
@@ -0,0 +1,27 @@
+import { test, expect } from "bun:test";
+import { Window } from "happy-dom";
+test("reproduction", async (): Promise<undefined> => {
+  expect.assertions(1);
+  for (let i: number = 0; i < 2; ++i) {
+    // TODO: have a reproduction of this that doesn't depend on a 10 MB file.
+    const response: Response = new Response(`<!DOCTYPE html>
+<html>
+  <head>
+    <script
+    id="base-js"
+    src="https://www.youtube.com/s/desktop/6ed1dd74/jsbin/desktop_polymer_legacy_browsers.vflset/desktop_polymer_legacy_browsers.js"
+    nonce="4oKS2biXokC0utrX4MKrsQ"></script>
+  </head>
+  </body>
+</html>`);
+    const window: Window = new Window({ url: "http://youtube.com" });
+    const localStorage = window.localStorage;
+    global.window = window;
+    global.document = window.document;
+    localStorage.clear();
+    document.body.innerHTML = await response.text();
+  }
+
+  // This test passes by simply not crashing.
+  expect().pass();
+});
diff --git a/test/package.json b/test/package.json
@@ -30,6 +30,7 @@
     "express": "4.18.2",
     "fast-glob": "3.3.1",
     "filenamify": "6.0.0",
+    "happy-dom": "16.5.3",
     "http2-wrapper": "2.2.1",
     "https-proxy-agent": "7.0.5",
     "iconv-lite": "0.6.3",