Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog.d/11243-buffer-view-predicates.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix `ArrayBuffer.isView`, `util.types.isArrayBufferView`, `util.types.isUint8Array`, and `util.types.isTypedArray` returning false for Node Buffers (#11239).

Both direct calls and extracted `ArrayBuffer.isView` calls now recognize Buffer-backed typed arrays through the existing typed-array brand classifier. Raw ArrayBuffer/SharedArrayBuffer, DataView, and crypto key backings retain their distinct brands. Regression coverage includes allocated Buffers, subarrays, shared backing spans, and the view/byte-length check used by bson UUID decoding.
3 changes: 2 additions & 1 deletion crates/perry-runtime/src/object/global_this/typed_array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ pub(crate) extern "C" fn array_buffer_is_view_thunk(
};
let is_view = (addr != 0
&& !crate::buffer::is_any_array_buffer(addr)
&& (crate::buffer::is_uint8array_buffer(addr) || crate::buffer::is_data_view(addr)))
&& (super::super::typed_array_proto_thunks::is_typed_array_buffer(addr)
|| crate::buffer::is_data_view(addr)))
|| jsvalue_extends_data_view(value)
|| jsvalue_extends_typed_array(value)
|| crate::typedarray::lookup_typed_array_kind(addr).is_some();
Expand Down
66 changes: 65 additions & 1 deletion crates/perry-runtime/src/object/util_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn jsvalue_extends_data_view(value: f64) -> bool {
#[inline]
fn jsvalue_typed_array_kind(v: f64) -> Option<u8> {
let addr = jsvalue_addr(v);
if crate::buffer::is_uint8array_buffer(addr) {
if super::typed_array_proto_thunks::is_typed_array_buffer(addr) {
Some(crate::typedarray::KIND_UINT8)
} else {
crate::typedarray::lookup_typed_array_kind(addr)
Expand Down Expand Up @@ -442,3 +442,67 @@ pub extern "C" fn js_util_types_is_set_iterator(value: f64) -> f64 {
|| crate::set::is_registered_set_iterator(addr),
)
}

#[cfg(test)]
mod buffer_view_tests {
use super::*;

fn check_buffer(mark: Option<fn(usize)>, view: bool, typed: bool) {
let buffer = crate::buffer::buffer_alloc(4);
if let Some(mark) = mark {
mark(buffer as usize);
}
let value = f64::from_bits(JSValue::pointer(buffer.cast()).bits());
let expected_view = JSValue::bool(view).bits();
let expected_typed = JSValue::bool(typed).bits();
assert_eq!(
js_util_types_is_array_buffer_view(value).to_bits(),
expected_view
);
assert_eq!(
super::super::global_this::array_buffer_is_view_thunk(std::ptr::null(), value)
.to_bits(),
expected_view,
);
assert_eq!(
js_util_types_is_typed_array(value).to_bits(),
expected_typed
);
assert_eq!(
js_util_types_is_uint8_array(value).to_bits(),
expected_typed
);
assert_eq!(
js_util_types_is_int8_array(value).to_bits(),
crate::value::TAG_FALSE
);
}

#[test]
fn node_buffer_is_a_uint8_array_view() {
check_buffer(None, true, true);
}

#[test]
fn buffer_backings_keep_their_distinct_predicate_brands() {
check_buffer(Some(crate::buffer::mark_as_uint8array), true, true);
check_buffer(Some(crate::buffer::mark_as_data_view), true, false);
check_buffer(Some(crate::buffer::mark_as_array_buffer), false, false);
check_buffer(
Some(crate::buffer::mark_as_shared_array_buffer),
false,
false,
);
check_buffer(Some(crate::buffer::mark_as_secret_key), false, false);
check_buffer(
Some(|addr| crate::buffer::mark_as_crypto_key(addr, 0, 0, 0)),
false,
false,
);
check_buffer(
Some(|addr| crate::buffer::mark_as_asymmetric_key(addr, 0, 0)),
false,
false,
);
}
}
35 changes: 35 additions & 0 deletions test-files/test_gap_11239_buffer_view_predicates.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { types } from 'node:util';

const isView = ArrayBuffer.isView;
const isUtilView = types.isArrayBufferView;
const isUint8 = types.isUint8Array;
const isTyped = types.isTypedArray;
function check(label: string, value: any) {
console.log(label, ArrayBuffer.isView(value), isView(value),
types.isArrayBufferView(value), isUtilView(value),
types.isUint8Array(value), isUint8(value),
types.isTypedArray(value), isTyped(value), types.isInt8Array(value));
}
const buffer = Buffer.alloc(4);
check('alloc', buffer);
check('empty', Buffer.alloc(0));
check('from', Buffer.from('abc'));
check('subarray', buffer.subarray(1, 3));
check('slice', buffer.slice(1, 3));
check('backing', Buffer.from(new ArrayBuffer(32), 8, 16));
check('uint8', new Uint8Array(4));
check('int8', new Int8Array(4));
check('uint16', new Uint16Array(4));
check('dataview', new DataView(new ArrayBuffer(4)));
check('arraybuffer', new ArrayBuffer(4));
check('shared', new SharedArrayBuffer(4));
check('array', [1, 2]);
check('object', { byteLength: 16 });
check('null', null);
check('undefined', undefined);
check('number', 42);
check('string', 'abc');
// bson's UUID constructor uses this view check before accepting a byte span.
const bytes = Buffer.from(new ArrayBuffer(32), 8, 16).subarray(0, 16);
console.log('uuid bytes', ArrayBuffer.isView(bytes) && bytes.byteLength === 16);
console.log('instanceof', buffer instanceof Uint8Array);
Loading