GeezerVison is showing github.com — ffi: validate fast 32-bit integer argument ranges · nodejs/node@b348ed7
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: lib/internal/ffi/fast-api.js +4Lines changed: 4 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -46,6 +46,10 @@ const fastIntegerTypeInfo = { | 46 | 46 | int16: { kind: 'number', min: -32768, max: 32767, label: 'an int16' }, | 47 | 47 | u16: { kind: 'number', min: 0, max: 65535, label: 'a uint16' }, | 48 | 48 | uint16: { kind: 'number', min: 0, max: 65535, label: 'a uint16' }, | | 49 | + i32: { kind: 'number', min: -2147483648, max: 2147483647, label: 'an int32' }, | | 50 | + int32: { kind: 'number', min: -2147483648, max: 2147483647, label: 'an int32' }, | | 51 | + u32: { kind: 'number', min: 0, max: 4294967295, label: 'a uint32' }, | | 52 | + uint32: { kind: 'number', min: 0, max: 4294967295, label: 'a uint32' }, | 49 | 53 | i64: { kind: 'bigint', min: I64_MIN, max: I64_MAX, label: 'an int64' }, | 50 | 54 | int64: { kind: 'bigint', min: I64_MIN, max: I64_MAX, label: 'an int64' }, | 51 | 55 | u64: { kind: 'bigint', min: 0n, max: U64_MAX, label: 'a uint64' }, | |
Collapse file Copy file name to clipboardExpand all lines: src/ffi/fast.cc +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -164,7 +164,8 @@ bool SignatureNeedsFastIntegerValidation(const FFIFunction& fn) { | 164 | 164 | for (const std::string& name : fn.arg_type_names) { | 165 | 165 | if (name == "bool" || name == "char" || name == "i8" || name == "int8" || | 166 | 166 | name == "u8" || name == "uint8" || name == "i16" || name == "int16" || | 167 | | - name == "u16" || name == "uint16" || name == "i64" || name == "int64" || | | 167 | + name == "u16" || name == "uint16" || name == "i32" || name == "int32" || | | 168 | + name == "u32" || name == "uint32" || name == "i64" || name == "int64" || | 168 | 169 | name == "u64" || name == "uint64") { | 169 | 170 | return true; | 170 | 171 | } | |
Collapse file Copy file name to clipboardExpand all lines: test/ffi/test-ffi-fast-integer-validation.js +14Lines changed: 14 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -28,6 +28,10 @@ test('fast FFI validates integer argument ranges', () => { | 28 | 28 |
| 29 | 29 | function callU16(value) { return functions.add_u16(value, 0); } | 30 | 30 |
| | 31 | + function callI32(value) { return functions.add_i32(value, 0); } | | 32 | + | | 33 | + function callU32(value) { return functions.add_u32(value, 0); } | | 34 | + | 31 | 35 | function callI64(value) { return functions.add_i64(value, 0n); } | 32 | 36 |
| 33 | 37 | function callU64(value) { return functions.add_u64(value, 0n); } | @@ -37,6 +41,8 @@ test('fast FFI validates integer argument ranges', () => { | 37 | 41 | [callU8, 0], | 38 | 42 | [callI16, 0], | 39 | 43 | [callU16, 0], | | 44 | + [callI32, 0], | | 45 | + [callU32, 0], | 40 | 46 | [callI64, 0n], | 41 | 47 | [callU64, 0n], | 42 | 48 | ]) { | @@ -48,6 +54,14 @@ test('fast FFI validates integer argument ranges', () => { | 48 | 54 | assert.throws(() => callU8(256), expect); | 49 | 55 | assert.throws(() => callI16(32768), expect); | 50 | 56 | assert.throws(() => callU16(65536), expect); | | 57 | + assert.throws(() => callI32(2147483648), expect); | | 58 | + assert.throws(() => callI32(-2147483649), expect); | | 59 | + assert.throws(() => callI32(1.5), expect); | | 60 | + assert.throws(() => callI32('1'), expect); | | 61 | + assert.throws(() => callU32(4294967296), expect); | | 62 | + assert.throws(() => callU32(-1), expect); | | 63 | + assert.throws(() => callU32(1.5), expect); | | 64 | + assert.throws(() => callU32('1'), expect); | 51 | 65 | assert.throws(() => callI64(2n ** 63n), expect); | 52 | 66 | assert.throws(() => callU64(2n ** 64n), expect); | 53 | 67 | } finally { | |
|