1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-24 15:19:26 -05:00

fix(fetch): Fix uncaught rejection panic with WebAssembly.instantiateStreaming (#13925)

When an exception is thrown during the processing of streaming WebAssembly,
`op_wasm_streaming_abort` is called. This op calls into V8, which synchronously
rejects the promise and calls into the promise rejection handler, if applicable.
But calling an op borrows the isolate's `JsRuntimeState` for the duration of the
op, which means it is borrowed when V8 calls into `promise_reject_callback`,
which tries to borrow it again, panicking.

This change changes `op_wasm_streaming_abort` from an op to a binding
(`Deno.core.abortWasmStreaming`). Although that binding must borrow the
`JsRuntimeState` in order to access the `WasmStreamingResource` stored in the
`OpTable`, it also takes ownership of that `WasmStreamingResource` instance,
which means it can drop any borrows of the `JsRuntimeState` before calling into
V8.
This commit is contained in:
Andreu Botella 2022-03-22 11:33:29 +01:00 committed by GitHub
parent c5792d6d1d
commit 12d28dffc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 60 additions and 26 deletions

View file

@ -2511,3 +2511,9 @@ itest!(config_not_auto_discovered_for_remote_script {
output_str: Some("ok\n"),
http_server: true,
});
itest!(wasm_streaming_panic_test {
args: "run wasm_streaming_panic_test.js",
output: "wasm_streaming_panic_test.js.out",
exit_code: 1,
});

View file

@ -0,0 +1,3 @@
// https://github.com/denoland/deno/issues/13917
WebAssembly.instantiateStreaming(Response.error());

View file

@ -0,0 +1,2 @@
error: Uncaught (in promise) TypeError: Invalid WebAssembly content type.
at deno:ext/fetch/26_fetch.js:[WILDCARD]

View file

@ -7,10 +7,12 @@ use crate::modules::parse_import_assertions;
use crate::modules::validate_import_assertions;
use crate::modules::ImportAssertionsKind;
use crate::modules::ModuleMap;
use crate::ops_builtin::WasmStreamingResource;
use crate::resolve_url_or_path;
use crate::JsRuntime;
use crate::OpState;
use crate::PromiseId;
use crate::ResourceId;
use crate::ZeroCopyBuf;
use anyhow::Error;
use log::debug;
@ -99,6 +101,9 @@ pub static EXTERNAL_REFERENCES: Lazy<v8::ExternalReferences> =
v8::ExternalReference {
function: set_wasm_streaming_callback.map_fn_to(),
},
v8::ExternalReference {
function: abort_wasm_streaming.map_fn_to(),
},
])
});
@ -226,6 +231,7 @@ pub fn initialize_context<'s>(
"setWasmStreamingCallback",
set_wasm_streaming_callback,
);
set_func(scope, core_val, "abortWasmStreaming", abort_wasm_streaming);
// Direct bindings on `window`.
set_func(scope, global, "queueMicrotask", queue_microtask);
@ -762,8 +768,6 @@ fn set_wasm_streaming_callback(
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
use crate::ops_builtin::WasmStreamingResource;
let cb = match arg0_to_cb(scope, args) {
Ok(cb) => cb,
Err(()) => return,
@ -805,6 +809,48 @@ fn set_wasm_streaming_callback(
});
}
fn abort_wasm_streaming(
scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,
_rv: v8::ReturnValue,
) {
let rid: ResourceId = match serde_v8::from_v8(scope, args.get(0)) {
Ok(rid) => rid,
Err(_) => return throw_type_error(scope, "Invalid argument"),
};
let exception = args.get(1);
let wasm_streaming = {
let state_rc = JsRuntime::state(scope);
let state = state_rc.borrow();
let wsr = state
.op_state
.borrow_mut()
.resource_table
.take::<WasmStreamingResource>(rid);
match wsr {
Ok(wasm_streaming) => wasm_streaming,
Err(err) => {
let message = v8::String::new(scope, &err.to_string()).unwrap();
let v8_error = v8::Exception::error(scope, message);
scope.throw_exception(v8_error);
return;
}
}
};
// At this point there are no clones of Rc<WasmStreamingResource> on the
// resource table, and no one should own a reference because we're never
// cloning them. So we can be sure `wasm_streaming` is the only reference.
if let Ok(wsr) = std::rc::Rc::try_unwrap(wasm_streaming) {
// NOTE: v8::WasmStreaming::abort can't be called while `state` is borrowed;
// see https://github.com/denoland/deno/issues/13917
wsr.0.into_inner().abort(Some(exception));
} else {
panic!("Couldn't consume WasmStreamingResource.");
}
}
fn encode(
scope: &mut v8::HandleScope,
args: v8::FunctionCallbackArguments,

View file

@ -26,7 +26,6 @@ pub(crate) fn init_builtins() -> Extension {
op_print::decl(),
op_resources::decl(),
op_wasm_streaming_feed::decl(),
op_wasm_streaming_abort::decl(),
op_wasm_streaming_set_url::decl(),
op_void_sync::decl(),
op_void_async::decl(),
@ -142,28 +141,6 @@ pub fn op_wasm_streaming_feed(
Ok(())
}
/// Abort a WasmStreamingResource.
#[op]
pub fn op_wasm_streaming_abort(
state: &mut OpState,
rid: ResourceId,
exception: serde_v8::Value,
) -> Result<(), Error> {
let wasm_streaming =
state.resource_table.take::<WasmStreamingResource>(rid)?;
// At this point there are no clones of Rc<WasmStreamingResource> on the
// resource table, and no one should own a reference because we're never
// cloning them. So we can be sure `wasm_streaming` is the only reference.
if let Ok(wsr) = Rc::try_unwrap(wasm_streaming) {
wsr.0.into_inner().abort(Some(exception.v8_value));
} else {
panic!("Couldn't consume WasmStreamingResource.");
}
Ok(())
}
#[op]
pub fn op_wasm_streaming_set_url(
state: &mut OpState,

View file

@ -556,7 +556,7 @@
core.close(rid);
} catch (err) {
// 2.8 and 3
core.opSync("op_wasm_streaming_abort", rid, err);
core.abortWasmStreaming(rid, err);
}
})();
}