Skip to content

Cherry-pick bellard/quickjs@1eb05e44fa #1020

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
merged 1 commit into from
Apr 8, 2025
Merged

Cherry-pick bellard/quickjs@1eb05e44fa #1020

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
7 changes: 5 additions & 2 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36250,6 +36250,10 @@ static JSString *JS_ReadString(BCReaderState *s)
return NULL;
is_wide_char = len & 1;
len >>= 1;
if (len > JS_STRING_LEN_MAX) {
JS_ThrowInternalError(s->ctx, "string too long");
return NULL;
}
p = js_alloc_string(s->ctx, len, is_wide_char);
if (!p) {
s->error_state = -1;
Expand Down Expand Up @@ -36361,8 +36365,7 @@ static JSValue JS_ReadBigInt(BCReaderState *s)
bc_read_trace(s, "}\n");
return __JS_NewShortBigInt(s->ctx, 0);
}
p = js_bigint_new(s->ctx,
(len + (JS_LIMB_BITS / 8) - 1) / (JS_LIMB_BITS / 8));
p = js_bigint_new(s->ctx, (len - 1) / (JS_LIMB_BITS / 8) + 1);
if (!p)
goto fail;
for(i = 0; i < len / (JS_LIMB_BITS / 8); i++) {
Expand Down
9 changes: 5 additions & 4 deletions tests/test_bjson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,17 @@ function bjson_test_bytecode()
function bjson_test_fuzz()
{
var corpus = [
"EBAAAAAABGA=",
"EObm5oIt",
"EAARABMGBgYGBgYGBgYGBv////8QABEALxH/vy8R/78=",
"FBAAAAAABGA=",
"FObm5oIt",
"FAARABMGBgYGBgYGBgYGBv////8QABEALxH/vy8R/78=",
"FAAIfwAK/////3//////////////////////////////3/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAD5+fn5+fn5+fn5+fkAAAAAAAYAqw==",
];
for (var input of corpus) {
var buf = base64decode(input);
try {
bjson.read(buf, 0, buf.byteLength);
} catch (e) {
// okay, ignore
if (/invalid version/.test(e.message)) throw e; // corpus needs update
}
}
}
Expand Down
Loading