Skip to content

Check for NULL object references in deserializer #1327

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
bnoordhuis merged 1 commit into from
Feb 1, 2026
+10 −9
Merged

Check for NULL object references in deserializer #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38649,7 +38649,7 @@ static JSValue JS_ReadObjectRec(BCReaderState *s)
if (bc_get_leb128(s, &val))
return JS_EXCEPTION;
bc_read_trace(s, "%u\n", val);
if (val >= s->objects_count) {
if (val >= s->objects_count || !s->objects[val]) {
return JS_ThrowSyntaxError(ctx, "invalid object reference (%u >= %u)",
val, s->objects_count);
}
Expand Down
17 changes: 9 additions & 8 deletions tests/test_bjson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,15 +268,15 @@ function bjson_test_bytecode()
var buf, o, r, e, i;

o = std.evalScript(";(function f(o){ return o.i })", {compile_only: true});
buf = bjson.write(o, /*JS_WRITE_OBJ_BYTECODE*/(1 << 0));
buf = bjson.write(o, bjson.WRITE_OBJ_BYTECODE);
try {
bjson.read(buf, 0, buf.byteLength);
} catch (_e) {
e = _e;
}
assert(String(e), "SyntaxError: no bytecode allowed");

o = bjson.read(buf, 0, buf.byteLength, /*JS_READ_OBJ_BYTECODE*/(1 << 0));
o = bjson.read(buf, 0, buf.byteLength, bjson.READ_OBJ_BYTECODE);
assert(String(o), "[function bytecode]");
o = std.evalScript(o, {eval_function: true});
for (i = 0; i < 42; i++) o({i}); // exercise o.i IC
Expand All @@ -285,15 +285,16 @@ function bjson_test_bytecode()
function bjson_test_fuzz()
{
var corpus = [
"FxAAAAAABGA=",
"F+bm5oIt",
"FwARABMGBgYGBgYGBgYGBv////8QABEALxH/vy8R/78=",
"FwAIfwAK/////3//////////////////////////////3/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAD5+fn5+fn5+fn5+fkAAAAAAAYAqw==",
["FxAAAAAABGA="],
["F+bm5oIt"],
["FwARABMGBgYGBgYGBgYGBv////8QABEALxH/vy8R/78="],
["FwAIfwAK/////3//////////////////////////////3/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAD5+fn5+fn5+fn5+fkAAAAAAAYAqw=="],
["FwAOAAAAFAA=", bjson.READ_OBJ_REFERENCE],
];
for (var input of corpus) {
for (var [input, flags] of corpus) {
var buf = base64decode(input);
try {
bjson.read(buf, 0, buf.byteLength);
bjson.read(buf, 0, buf.byteLength, flags);
} catch (e) {
if (/invalid version/.test(e.message)) throw e; // corpus needs update
}
Expand Down