Skip to content

Fix CookieMap.toJSON() crash with numeric cookie names #28314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alii merged 4 commits into from
Mar 20, 2026
+25 −3
Merged

Fix CookieMap.toJSON() crash with numeric cookie names #28314

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cbbdb7
Fix CookieMap.toJSON() crash with numeric cookie names
robobun Mar 20, 2026
a4b13a0
Fix CookieMap.toJSON() own-property check to not traverse prototype c…
robobun Mar 20, 2026
f46af31
Use HashSet for cookie dedup in toJSON instead of getDirectOffset
robobun Mar 20, 2026
944a266
Retrigger CI
robobun Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/bun.js/bindings/CookieMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,17 @@ JSC::JSValue CookieMap::toJSON(JSC::JSGlobalObject* globalObject) const
// Add modified cookies to the object
for (const auto& cookie : m_modifiedCookies) {
if (!cookie->value().isEmpty()) {
object->putDirect(vm, JSC::Identifier::fromString(vm, cookie->name()), JSC::jsString(vm, cookie->value()));
object->putDirectMayBeIndex(globalObject, JSC::Identifier::fromString(vm, cookie->name()), JSC::jsString(vm, cookie->value()));
RETURN_IF_EXCEPTION(scope, {});
}
}

// Add original cookies to the object
for (const auto& cookie : m_originalCookies) {
// Skip if this cookie name was already added from modified cookies
if (!object->hasProperty(globalObject, JSC::Identifier::fromString(vm, cookie.key))) {
object->putDirect(vm, JSC::Identifier::fromString(vm, cookie.key), JSC::jsString(vm, cookie.value));
// Skip if this cookie name was already added from modified cookies (own-property check only)
auto ident = JSC::Identifier::fromString(vm, cookie.key);
if (object->getDirectOffset(vm, ident) == JSC::invalidOffset) {
object->putDirectMayBeIndex(globalObject, ident, JSC::jsString(vm, cookie.value));
RETURN_IF_EXCEPTION(scope, {});
}
Comment thread
claude[bot] marked this conversation as resolved.
Outdated
}
Expand Down
18 changes: 18 additions & 0 deletions test/js/bun/cookie/cookie-map.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,24 @@ describe("Bun.Cookie and Bun.CookieMap", () => {
`);
});

test("CookieMap.toJSON() handles numeric cookie names", () => {
const map = new Bun.CookieMap("0=first; 1=second; 42=answer");
expect(map.toJSON()).toEqual({
"0": "first",
"1": "second",
"42": "answer",
});
});

test("CookieMap.toJSON() handles cookie names matching Object.prototype properties", () => {
const map = new Bun.CookieMap("toString=hello; constructor=world; valueOf=test");
expect(map.toJSON()).toEqual({
"toString": "hello",
"constructor": "world",
"valueOf": "test",
});
});

test("CookieMap works with cookies with advanced attributes", () => {
const map = new Bun.CookieMap();

Expand Down
Loading