mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
82a59d9894
* chore: bump node in DEPS to v22.16.0 * crypto: remove BoringSSL dh-primes addition https://github.com/nodejs/node/pull/57023 * tools: enable linter in test/fixtures/test\-runner/output https://github.com/nodejs/node/pull/57698 * src: improve thread safety of TaskQueue https://github.com/nodejs/node/pull/57910 * buffer: define global v8::CFunction objects as const https://github.com/nodejs/node/pull/57676 * src: disable abseil deadlock detection https://github.com/nodejs/node/pull/57582 * zlib: fix pointer alignment https://github.com/nodejs/node/pull/57727 * chore: fixup patch indices * src: set default config as node.config.json https://github.com/nodejs/node/pull/57171 * src: update std::vector<v8::Local<T>> to use v8::LocalVector<T> https://github.com/nodejs/node/pull/57578 * test: disable chmod tests failing in Docker https://github.com/nodejs/node/issues/58326 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
94 lines
3.7 KiB
Diff
94 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Haas <ahaas@chromium.org>
|
|
Date: Sun, 28 Jul 2024 09:20:12 +0200
|
|
Subject: src: stop using deprecated fields of `v8::FastApiCallbackOptions`
|
|
|
|
Two fields on the `v8::FastApiCallbackOptions` struct were deprecated
|
|
recently: `fallback` and `wasm_memory`. This PR removes uses of these
|
|
two fields in node.js.
|
|
|
|
(This is a subset of upstream commit d0000b118 from the `canary-base`
|
|
branch of Node.js. This patch can be removed when Electron upgrades to
|
|
a stable Node release that contains the change. -- Charles)
|
|
|
|
diff --git a/src/crypto/crypto_timing.cc b/src/crypto/crypto_timing.cc
|
|
index 3d8ccc77b5952a999c5fe48792259d32b402c460..867a1c4aca54b9d41490d23a5eb55088b7e941cc 100644
|
|
--- a/src/crypto/crypto_timing.cc
|
|
+++ b/src/crypto/crypto_timing.cc
|
|
@@ -59,7 +59,8 @@ bool FastTimingSafeEqual(Local<Value> receiver,
|
|
if (a.length() != b.length() || !a.getStorageIfAligned(&data_a) ||
|
|
!b.getStorageIfAligned(&data_b)) {
|
|
TRACK_V8_FAST_API_CALL("crypto.timingSafeEqual.error");
|
|
- options.fallback = true;
|
|
+ v8::HandleScope scope(options.isolate);
|
|
+ THROW_ERR_CRYPTO_TIMING_SAFE_EQUAL_LENGTH(options.isolate);
|
|
return false;
|
|
}
|
|
|
|
diff --git a/src/histogram.cc b/src/histogram.cc
|
|
index 5641990e0bac455c33ddf7b9a865deba871516e7..bd757f42e02391abbeec007d9c4cea60bcdfa6a4 100644
|
|
--- a/src/histogram.cc
|
|
+++ b/src/histogram.cc
|
|
@@ -195,7 +195,8 @@ void HistogramBase::FastRecord(Local<Value> unused,
|
|
const int64_t value,
|
|
FastApiCallbackOptions& options) {
|
|
if (value < 1) {
|
|
- options.fallback = true;
|
|
+ Environment* env = Environment::GetCurrent(options.isolate);
|
|
+ THROW_ERR_OUT_OF_RANGE(env, "value is out of range");
|
|
return;
|
|
}
|
|
HistogramBase* histogram;
|
|
diff --git a/src/node_file.cc b/src/node_file.cc
|
|
index 5aea65d6800494def62829432ee48f9c06e65d63..80cf6648ed99241eea8c176c5c958d76fe33aa14 100644
|
|
--- a/src/node_file.cc
|
|
+++ b/src/node_file.cc
|
|
@@ -1071,13 +1071,8 @@ static int32_t FastInternalModuleStat(
|
|
// NOLINTNEXTLINE(runtime/references) This is V8 api.
|
|
FastApiCallbackOptions& options) {
|
|
// This needs a HandleScope which needs an isolate.
|
|
- Isolate* isolate = Isolate::TryGetCurrent();
|
|
- if (!isolate) {
|
|
- options.fallback = true;
|
|
- return -1;
|
|
- }
|
|
-
|
|
- HandleScope scope(isolate);
|
|
+ Environment* env = Environment::GetCurrent(options.isolate);
|
|
+ HandleScope scope(env->isolate());
|
|
|
|
auto path = std::filesystem::path(input.data, input.data + input.length);
|
|
|
|
diff --git a/src/node_wasi.cc b/src/node_wasi.cc
|
|
index 090866960beb8f1759c99e95536924b8b61fb723..3f91b651b83a20e70d5b368e012f5ee4b9d16092 100644
|
|
--- a/src/node_wasi.cc
|
|
+++ b/src/node_wasi.cc
|
|
@@ -275,17 +275,19 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback(
|
|
return EinvalError<R>();
|
|
}
|
|
|
|
- if (options.wasm_memory == nullptr || wasi->memory_.IsEmpty()) [[unlikely]] {
|
|
- // fallback to slow path which to throw an error about missing memory.
|
|
- options.fallback = true;
|
|
+ v8::Isolate* isolate = receiver->GetIsolate();
|
|
+ v8::HandleScope handle_scope(isolate);
|
|
+ if (wasi->memory_.IsEmpty()) {
|
|
+ THROW_ERR_WASI_NOT_STARTED(isolate);
|
|
return EinvalError<R>();
|
|
}
|
|
- uint8_t* memory = nullptr;
|
|
- CHECK(options.wasm_memory->getStorageIfAligned(&memory));
|
|
|
|
- return F(*wasi,
|
|
- {reinterpret_cast<char*>(memory), options.wasm_memory->length()},
|
|
- args...);
|
|
+ Local<ArrayBuffer> ab = wasi->memory_.Get(isolate)->Buffer();
|
|
+ size_t mem_size = ab->ByteLength();
|
|
+ char* mem_data = static_cast<char*>(ab->Data());
|
|
+ CHECK_NOT_NULL(mem_data);
|
|
+
|
|
+ return F(*wasi, {mem_data, mem_size}, args...);
|
|
}
|
|
|
|
namespace {
|