Skip to content

Commit d5f59dd

Browse files
committed
Account for Firefox SharedArrayBuffer bug in shared workers
1 parent d0b6d66 commit d5f59dd

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/backends/wasm_js.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub use crate::util::{inner_u32, inner_u64};
1616
#[cfg(not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "none"))))]
1717
compile_error!("`wasm_js` backend can be enabled only for OS-less WASM targets!");
1818

19-
use js_sys::{SharedArrayBuffer, Uint8Array, WebAssembly::Memory};
19+
use js_sys::{JsString, Object, Uint8Array, WebAssembly::Memory};
2020
use wasm_bindgen::{prelude::wasm_bindgen, JsCast, JsValue};
2121

2222
// Size of our temporary Uint8Array buffer used with WebCrypto methods
@@ -39,7 +39,10 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
3939
MEMORY_KIND_SHARED => true,
4040
MEMORY_KIND_UNINIT => {
4141
let memory: Memory = wasm_bindgen::memory().unchecked_into();
42-
let val = if memory.buffer().is_instance_of::<SharedArrayBuffer>() {
42+
// We can't use `instanceof` because of a bug in Firefox.
43+
// Instead we compare the constructor name, which always works.
44+
let constructor_name = Object::from(memory.buffer()).constructor().name();
45+
let val = if SHARED_ARRAY_BUFFER_NAME.with(|name| &constructor_name == name) {
4346
MEMORY_KIND_SHARED
4447
} else {
4548
MEMORY_KIND_NOT_SHARED
@@ -87,6 +90,7 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
8790
}
8891

8992
#[wasm_bindgen]
93+
#[rustfmt::skip]
9094
extern "C" {
9195
// Web Crypto API: Crypto interface (https://www.w3.org/TR/WebCryptoAPI/)
9296
type Crypto;
@@ -98,4 +102,6 @@ extern "C" {
98102
fn get_random_values(this: &Crypto, buf: &Uint8Array) -> Result<(), JsValue>;
99103
#[wasm_bindgen(method, js_name = getRandomValues, catch)]
100104
fn get_random_values_ref(this: &Crypto, buf: &mut [u8]) -> Result<(), JsValue>;
105+
#[wasm_bindgen(thread_local_v2, static_string)]
106+
static SHARED_ARRAY_BUFFER_NAME: JsString = "SharedArrayBuffer";
101107
}

0 commit comments

Comments
 (0)