Skip to content

fix(cbor): stop leaking inherited keys into encoded objects #7250

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

Open
tomas-zijdemans wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −6
Open

fix(cbor): stop leaking inherited keys into encoded objects #7250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92f715d
fix(cbor): stop leaking inherited keys into encoded objects
tomas-zijdemans Jul 24, 2026
5292a9e
fix code comment
tomas-zijdemans Jul 24, 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
14 changes: 8 additions & 6 deletions cbor/_common_encode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ export function calcEncodingSize(x: CborType): number {
for (const y of x) size += calcEncodingSize(y[0]) + calcEncodingSize(y[1]);
return size;
}
let pairs = 0;
// Must iterate the same keys as encodeObject().
const keys = Object.keys(x);
let size = 0;
for (const y in x) {
++pairs;
for (const y of keys) {
size += calcHeaderSize(y.length) + y.length + calcEncodingSize(x[y]);
}
return size + calcHeaderSize(pairs);
return size + calcHeaderSize(keys.length);
}

export function encode(
Expand Down Expand Up @@ -217,8 +217,10 @@ function encodeObject(
offset: number,
): number {
output[offset] = 0b101_00000;
offset = encodeHeader(0b101_00000, Object.keys(input).length, output, offset);
for (const key in input) {
// Must iterate the same keys as calcObjectEncodingSize().
const keys = Object.keys(input);
offset = encodeHeader(0b101_00000, keys.length, output, offset);
for (const key of keys) {
offset = encodeString(key, output, offset);
offset = encode(input[key], output, offset);
}
Expand Down
Loading