Skip to content
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

Jump to bottom

fix(ext/ffi): Check CStr for UTF-8 validity on read #15318

Merged
merged 14 commits into from
Aug 5, 2022
Merged

fix(ext/ffi): Check CStr for UTF-8 validity on read #15318

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e35f372
fix(ext/ffi): Check CStr for UTF-8 validity on read
aapoalas Jul 27, 2022
f44a491
format
aapoalas Jul 27, 2022
7a49e21
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 27, 2022
cb95e7e
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 27, 2022
a288b5b
Add test
aapoalas Jul 27, 2022
1421bd2
Make error a bit more visible
aapoalas Jul 27, 2022
195e685
Update ext/ffi/lib.rs
aapoalas Jul 28, 2022
bbd622c
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 28, 2022
da69f91
fmt
aapoalas Jul 28, 2022
5c14b24
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 28, 2022
965818d
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 29, 2022
c6fe889
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 30, 2022
696325d
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Jul 31, 2022
28d7e0a
Merge branch 'main' into fix-ext-ffi-cstr-check-utf8
aapoalas Aug 5, 2022
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
Prev Previous commit
Next Next commit
Update ext/ffi/lib.rs 
Co-authored-by: Phosra <[email protected]>
  • Loading branch information
@aapoalas
aapoalas and Phosra authored Jul 28, 2022
commit 195e68547d2b20adc35b44e9fbedbd0f9d168357
5 changes: 2 additions & 3 deletions ext/ffi/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2144,10 +2144,9 @@ where
// SAFETY: Pointer is user provided.
let cstr = unsafe { CStr::from_ptr(ptr as *const c_char) }
.to_str()
.map_err(|_| type_error("Invalid CString pointer, not valid UTF-8"))?
.as_bytes();
.map_err(|_| type_error("Invalid CString pointer, not valid UTF-8"))?;
let value: v8::Local<v8::Value> =
v8::String::new_from_utf8(scope, cstr, v8::NewStringType::Normal)
v8::String::new(scope, cstr)
.ok_or_else(|| {
type_error("Invalid CString pointer, string exceeds max length")
})?
Expand Down