foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

perf(ext/ffi): Revert UTF-8 validity check from getCString (#17741)

Browse source
This commit is contained in:
Aapo Alasuutari 2023-02-12 18:42:35 +02:00 • committed by GitHub
parent d4e5a295f2
commit 5a83af4837
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/ffi/repr.rs
View file

@ -145,14 +145,13 @@ where
let ptr = unsafe { ptr.add(offset) }; let ptr = unsafe { ptr.add(offset) };
// SAFETY: Pointer is user provided. // SAFETY: Pointer is user provided.
let cstr = unsafe { CStr::from_ptr(ptr as *const c_char) } let cstr = unsafe { CStr::from_ptr(ptr as *const c_char) }.to_bytes();
.to_str() let value: v8::Local<v8::Value> =
.map_err(|_| type_error("Invalid CString pointer, not valid UTF-8"))?; v8::String::new_from_utf8(scope, cstr, v8::NewStringType::Normal)
let value: v8::Local<v8::Value> = v8::String::new(scope, cstr) .ok_or_else(|| {
.ok_or_else(|| { type_error("Invalid CString pointer, string exceeds max length")
type_error("Invalid CString pointer, string exceeds max length") })?
})? .into();
.into();
Ok(value.into()) Ok(value.into())
} }

24
test_ffi/tests/test.js
View file

@ -699,10 +699,26 @@ assertEquals([...uint8Array], [
0x00 0x00
]); ]);
try { // Check that `getCString` works equally to `TextDecoder`
assertThrows(() => charView.getCString(), TypeError, "Invalid CString pointer, not valid UTF-8"); assertEquals(charView.getCString(), new TextDecoder().decode(uint8Array.subarray(0, uint8Array.length - 1)));
} catch (_err) {
console.log("Invalid UTF-8 characters to `v8::String`:", charView.getCString()); // Check a selection of various invalid UTF-8 sequences in C strings and verify
// that the `getCString` API does not cause unexpected behaviour.
for (const charBuffer of [
Uint8Array.from([0xA0, 0xA1, 0x00]),
Uint8Array.from([0xE2, 0x28, 0xA1, 0x00]),
Uint8Array.from([0xE2, 0x82, 0x28, 0x00]),
Uint8Array.from([0xF0, 0x28, 0x8C, 0xBC, 0x00]),
Uint8Array.from([0xF0, 0x90, 0x28, 0xBC, 0x00]),
Uint8Array.from([0xF0, 0x28, 0x8C, 0x28, 0x00]),
Uint8Array.from([0xF8, 0xA1, 0xA1, 0xA1, 0xA1, 0x00]),
Uint8Array.from([0xFC, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0x00]),
]) {
const charBufferPointer = Deno.UnsafePointer.of(charBuffer);
const charString = Deno.UnsafePointerView.getCString(charBufferPointer);
const charBufferPointerArrayBuffer = new Uint8Array(Deno.UnsafePointerView.getArrayBuffer(charBufferPointer, charBuffer.length - 1));
assertEquals(charString, new TextDecoder().decode(charBufferPointerArrayBuffer));
assertEquals([...charBuffer.subarray(0, charBuffer.length - 1)], [...charBufferPointerArrayBuffer]);
} }