fix(ops): fallback when FastApiOneByteString is not utf8 (#18518)

Fixes #18255
denoland · Mar 31, 2023 · feab94f · feab94f
1 parent b9a3790
commit feab94f
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,7 @@ license = "MIT"
 repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
-v8 = { version = "0.67.0", default-features = false }
+v8 = { version = "0.68.0", default-features = false }
 deno_ast = { version = "0.25.0", features = ["transpiling"] }
 
 deno_core = { version = "0.177.0", path = "./core" }

diff --git a/ops/optimizer.rs b/ops/optimizer.rs
@@ -200,13 +200,33 @@ impl Transform {
  *ty = parse_quote! { *const #core::v8::fast_api::FastApiOneByteString };
  match str_ty {
  StringType::Ref => q!(Vars { var: &ident }, {
- let var = unsafe { &*var }.as_str();
+ let var = match ::std::str::from_utf8(unsafe { &*var }.as_bytes()) {
+ Ok(v) => v,
+ Err(_) => {
+ unsafe { &mut *fast_api_callback_options }.fallback = true;
+ return Default::default();
+ }
+ };
  }),
  StringType::Cow => q!(Vars { var: &ident }, {
- let var = ::std::borrow::Cow::Borrowed(unsafe { &*var }.as_str());
+ let var = ::std::borrow::Cow::Borrowed(
+ match ::std::str::from_utf8(unsafe { &*var }.as_bytes()) {
+ Ok(v) => v,
+ Err(_) => {
+ unsafe { &mut *fast_api_callback_options }.fallback = true;
+ return Default::default();
+ }
+ },
+ );
  }),
  StringType::Owned => q!(Vars { var: &ident }, {
- let var = unsafe { &*var }.as_str().to_owned();
+ let var = match ::std::str::from_utf8(unsafe { &*var }.as_bytes()) {
+ Ok(v) => v.to_owned(),
+ Err(_) => {
+ unsafe { &mut *fast_api_callback_options }.fallback = true;
+ return Default::default();
+ }
+ };
  }),
  }
  }
@@ -718,6 +738,7 @@ impl Optimizer {
  let segment = single_segment(segments)?;
  match segment {
  PathSegment { ident, .. } if ident == "str" => {
+ self.needs_fast_callback_option = true;
  self.fast_parameters.push(FastValue::SeqOneByteString);
  assert!(self
  .transforms
@@ -742,6 +763,7 @@ impl Optimizer {
  if let Some(val) = get_fast_scalar(ident.to_string().as_str()) {
  self.fast_parameters.push(val);
  } else if ident == "String" {
+ self.needs_fast_callback_option = true;
  // Is `T` an owned String?
  self.fast_parameters.push(FastValue::SeqOneByteString);
  assert!(self
@@ -775,6 +797,7 @@ impl Optimizer {
  }
  // Is `T` a str?
  PathSegment { ident, .. } if ident == "str" => {
+ self.needs_fast_callback_option = true;
  self.fast_parameters.push(FastValue::SeqOneByteString);
  assert!(self
  .transforms

diff --git a/ops/optimizer_tests/cow_str.expected b/ops/optimizer_tests/cow_str.expected
@@ -3,7 +3,7 @@ returns_result: false
 has_ref_opstate: false
 has_rc_opstate: false
 has_fast_callback_option: false
-needs_fast_callback_option: false
+needs_fast_callback_option: true
 fast_result: Some(Void)
 fast_parameters: [V8Value, SeqOneByteString]
 transforms: {0: Transform { kind: SeqOneByteString(Cow), index: 0 }}

diff --git a/ops/optimizer_tests/cow_str.out b/ops/optimizer_tests/cow_str.out
@@ -31,7 +31,7 @@ impl op_cow_str {
  use deno_core::v8::fast_api::CType;
  Some(
  deno_core::v8::fast_api::FastFunction::new(
- &[V8Value, SeqOneByteString],
+ &[V8Value, SeqOneByteString, CallbackOptions],
  CType::Void,
  op_cow_str_fast_fn as *const ::std::ffi::c_void,
  ),
@@ -77,10 +77,19 @@ impl op_cow_str {
 fn op_cow_str_fast_fn<'scope>(
  _: deno_core::v8::Local<deno_core::v8::Object>,
  c: *const deno_core::v8::fast_api::FastApiOneByteString,
+ fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
 ) -> () {
  use deno_core::v8;
  use deno_core::_ops;
- let c = ::std::borrow::Cow::Borrowed(unsafe { &*c }.as_str());
+ let c = ::std::borrow::Cow::Borrowed(
+ match ::std::str::from_utf8(unsafe { &*c }.as_bytes()) {
+ Ok(v) => v,
+ Err(_) => {
+ unsafe { &mut *fast_api_callback_options }.fallback = true;
+ return Default::default();
+ }
+ },
+ );
  let result = op_cow_str::call(c);
  result
 }
diff --git a/ops/optimizer_tests/op_blob_revoke_object_url.expected b/ops/optimizer_tests/op_blob_revoke_object_url.expected
@@ -3,7 +3,7 @@ returns_result: true
 has_ref_opstate: true
 has_rc_opstate: false
 has_fast_callback_option: false
-needs_fast_callback_option: false
+needs_fast_callback_option: true
 fast_result: Some(Void)
 fast_parameters: [V8Value, SeqOneByteString]
 transforms: {1: Transform { kind: SeqOneByteString(Owned), index: 1 }}

diff --git a/ops/optimizer_tests/op_print.expected b/ops/optimizer_tests/op_print.expected
@@ -3,7 +3,7 @@ returns_result: true
 has_ref_opstate: true
 has_rc_opstate: false
 has_fast_callback_option: false
-needs_fast_callback_option: false
+needs_fast_callback_option: true
 fast_result: Some(Void)
 fast_parameters: [V8Value, SeqOneByteString, Bool]
 transforms: {1: Transform { kind: SeqOneByteString(Ref), index: 1 }}

diff --git a/ops/optimizer_tests/owned_string.expected b/ops/optimizer_tests/owned_string.expected
@@ -3,7 +3,7 @@ returns_result: false
 has_ref_opstate: false
 has_rc_opstate: false
 has_fast_callback_option: false
-needs_fast_callback_option: false
+needs_fast_callback_option: true
 fast_result: Some(U32)
 fast_parameters: [V8Value, SeqOneByteString]
 transforms: {0: Transform { kind: SeqOneByteString(Owned), index: 0 }}

diff --git a/ops/optimizer_tests/owned_string.out b/ops/optimizer_tests/owned_string.out
@@ -31,7 +31,7 @@ impl op_string_length {
  use deno_core::v8::fast_api::CType;
  Some(
  deno_core::v8::fast_api::FastFunction::new(
- &[V8Value, SeqOneByteString],
+ &[V8Value, SeqOneByteString, CallbackOptions],
  CType::Uint32,
  op_string_length_fast_fn as *const ::std::ffi::c_void,
  ),
@@ -89,10 +89,17 @@ impl op_string_length {
 fn op_string_length_fast_fn<'scope>(
  _: deno_core::v8::Local<deno_core::v8::Object>,
  string: *const deno_core::v8::fast_api::FastApiOneByteString,
+ fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
 ) -> u32 {
  use deno_core::v8;
  use deno_core::_ops;
- let string = unsafe { &*string }.as_str().to_owned();
+ let string = match ::std::str::from_utf8(unsafe { &*string }.as_bytes()) {
+ Ok(v) => v.to_owned(),
+ Err(_) => {
+ unsafe { &mut *fast_api_callback_options }.fallback = true;
+ return Default::default();
+ }
+ };
  let result = op_string_length::call(string);
  result
 }
diff --git a/ops/optimizer_tests/strings.expected b/ops/optimizer_tests/strings.expected
@@ -3,7 +3,7 @@ returns_result: false
 has_ref_opstate: false
 has_rc_opstate: false
 has_fast_callback_option: false
-needs_fast_callback_option: false
+needs_fast_callback_option: true
 fast_result: Some(U32)
 fast_parameters: [V8Value, SeqOneByteString]
 transforms: {0: Transform { kind: SeqOneByteString(Ref), index: 0 }}

diff --git a/ops/optimizer_tests/strings.out b/ops/optimizer_tests/strings.out
@@ -31,7 +31,7 @@ impl op_string_length {
  use deno_core::v8::fast_api::CType;
  Some(
  deno_core::v8::fast_api::FastFunction::new(
- &[V8Value, SeqOneByteString],
+ &[V8Value, SeqOneByteString, CallbackOptions],
  CType::Uint32,
  op_string_length_fast_fn as *const ::std::ffi::c_void,
  ),
@@ -90,10 +90,17 @@ impl op_string_length {
 fn op_string_length_fast_fn<'scope>(
  _: deno_core::v8::Local<deno_core::v8::Object>,
  string: *const deno_core::v8::fast_api::FastApiOneByteString,
+ fast_api_callback_options: *mut deno_core::v8::fast_api::FastApiCallbackOptions,
 ) -> u32 {
  use deno_core::v8;
  use deno_core::_ops;
- let string = unsafe { &*string }.as_str();
+ let string = match ::std::str::from_utf8(unsafe { &*string }.as_bytes()) {
+ Ok(v) => v,
+ Err(_) => {
+ unsafe { &mut *fast_api_callback_options }.fallback = true;
+ return Default::default();
+ }
+ };
  let result = op_string_length::call(string);
  result
 }
diff --git a/ops/optimizer_tests/strings_result.expected b/ops/optimizer_tests/strings_result.expected
@@ -3,7 +3,7 @@ returns_result: true
 has_ref_opstate: false
 has_rc_opstate: false
 has_fast_callback_option: false
-needs_fast_callback_option: false
+needs_fast_callback_option: true
 fast_result: Some(U32)
 fast_parameters: [V8Value, SeqOneByteString]
 transforms: {0: Transform { kind: SeqOneByteString(Ref), index: 0 }}