Skip to content

Port bellard/quickjs CVE fixes - batch 1 #1164

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 3 commits into from
Sep 29, 2025
Merged

Port bellard/quickjs CVE fixes - batch 1 #1164

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcd8562
fixed buffer overflow in js_bigint_from_string()
past-due Sep 26, 2025
50e2f93
fixed buffer overflow in js_bigint_to_string1()
past-due Sep 26, 2025
eb86ec9
fixed buffer overflow in TypedArray.prototype.lastIndexOf()
past-due Sep 26, 2025
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
40 changes: 18 additions & 22 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11697,6 +11697,7 @@ static JSBigInt *js_bigint_from_string(JSContext *ctx,
const char *str, int radix)
{
const char *p = str;
size_t n_digits1;
int is_neg, n_digits, n_limbs, len, log2_radix, n_bits, i;
JSBigInt *r;
js_limb_t v, c, h;
Expand All @@ -11708,10 +11709,16 @@ static JSBigInt *js_bigint_from_string(JSContext *ctx,
}
while (*p == '0')
p++;
n_digits = strlen(p);
n_digits1 = strlen(p);
/* the real check for overflox is done js_bigint_new(). Here
we just avoid integer overflow */
if (n_digits1 > JS_BIGINT_MAX_SIZE * JS_LIMB_BITS) {
JS_ThrowRangeError(ctx, "BigInt is too large to allocate");
return NULL;
}
n_digits = n_digits1;
log2_radix = 32 - clz32(radix - 1); /* ceil(log2(radix)) */
/* compute the maximum number of limbs */
/* XXX: overflow */
if (radix == 10) {
n_bits = (n_digits * 27 + 7) / 8; /* >= ceil(n_digits * log2(10)) */
} else {
Expand Down Expand Up @@ -11931,11 +11938,10 @@ static JSValue js_bigint_to_string1(JSContext *ctx, JSValueConst val, int radix)
bit_pos = i * log2_radix;
pos = bit_pos / JS_LIMB_BITS;
shift = bit_pos % JS_LIMB_BITS;
if (likely((shift + log2_radix) <= JS_LIMB_BITS)) {
c = r->tab[pos] >> shift;
} else {
c = (r->tab[pos] >> shift) |
(r->tab[pos + 1] << (JS_LIMB_BITS - shift));
c = r->tab[pos] >> shift;
if ((shift + log2_radix) > JS_LIMB_BITS &&
(pos + 1) < r->len) {
c |= r->tab[pos + 1] << (JS_LIMB_BITS - shift);
}
c &= (radix - 1);
*--q = digits[c];
Expand Down Expand Up @@ -54796,22 +54802,12 @@ static JSValue js_typed_array_indexOf(JSContext *ctx, JSValueConst this_val,
if (special == special_lastIndexOf) {
k = len - 1;
if (argc > 1) {
if (JS_ToFloat64(ctx, &d, argv[1]))
int64_t k1;
if (JS_ToInt64Clamp(ctx, &k1, argv[1], -1, len - 1, len))
goto exception;
if (isnan(d)) {
k = 0;
} else {
if (d >= 0) {
if (d < k) {
k = d;
}
} else {
d += len;
if (d < 0)
goto done;
k = d;
}
}
k = k1;
if (k < 0)
goto done;
}
stop = -1;
inc = -1;
Expand Down
Loading