Skip to content

ffi: validate fast i32 argument ranges #64691

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
trivikr wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

ffi: validate fast i32 argument ranges #64691

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: 2 additions & 0 deletions lib/internal/ffi/fast-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ const fastIntegerTypeInfo = {
int16: { kind: 'number', min: -32768, max: 32767, label: 'an int16' },
u16: { kind: 'number', min: 0, max: 65535, label: 'a uint16' },
uint16: { kind: 'number', min: 0, max: 65535, label: 'a uint16' },
i32: { kind: 'number', min: -2147483648, max: 2147483647, label: 'an int32' },
int32: { kind: 'number', min: -2147483648, max: 2147483647, label: 'an int32' },
i64: { kind: 'bigint', min: I64_MIN, max: I64_MAX, label: 'an int64' },
int64: { kind: 'bigint', min: I64_MIN, max: I64_MAX, label: 'an int64' },
u64: { kind: 'bigint', min: 0n, max: U64_MAX, label: 'a uint64' },
Expand Down
4 changes: 2 additions & 2 deletions src/ffi/fast.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ bool SignatureNeedsFastIntegerValidation(const FFIFunction& fn) {
for (const std::string& name : fn.arg_type_names) {
if (name == "bool" || name == "char" || name == "i8" || name == "int8" ||
name == "u8" || name == "uint8" || name == "i16" || name == "int16" ||
name == "u16" || name == "uint16" || name == "i64" || name == "int64" ||
name == "u64" || name == "uint64") {
name == "u16" || name == "uint16" || name == "i32" || name == "int32" ||
name == "i64" || name == "int64" || name == "u64" || name == "uint64") {
return true;
}
}
Expand Down
7 changes: 7 additions & 0 deletions test/ffi/test-ffi-fast-integer-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ test('fast FFI validates integer argument ranges', () => {

function callU16(value) { return functions.add_u16(value, 0); }

function callI32(value) { return functions.add_i32(value, 0); }

function callI64(value) { return functions.add_i64(value, 0n); }

function callU64(value) { return functions.add_u64(value, 0n); }
Expand All @@ -37,6 +39,7 @@ test('fast FFI validates integer argument ranges', () => {
[callU8, 0],
[callI16, 0],
[callU16, 0],
[callI32, 0],
[callI64, 0n],
[callU64, 0n],
]) {
Expand All @@ -48,6 +51,10 @@ test('fast FFI validates integer argument ranges', () => {
assert.throws(() => callU8(256), expect);
assert.throws(() => callI16(32768), expect);
assert.throws(() => callU16(65536), expect);
assert.throws(() => callI32(2147483648), expect);
assert.throws(() => callI32(-2147483649), expect);
assert.throws(() => callI32(1.5), expect);
assert.throws(() => callI32('1'), expect);
assert.throws(() => callI64(2n ** 63n), expect);
assert.throws(() => callU64(2n ** 64n), expect);
} finally {
Expand Down
Loading