mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: -Wunsafe-buffer-usage warning in ChunkedDataPipeReadableStream (32-x-y) (#44440)

Browse source 
* fix: -Wunsafe-buffer-usage warning in ChunkedDataPipeReadableStream (#44211)

* chore: rename v8_value_serializer.cc,h to v8_util.cc,h

* feat: add electron::util::as_byte_span(v8::Local<v8::ArrayBuffer>)

* fix: -Wunsafe-buffer-usage warnings in ChunkedDataPipeReadableStream::ReadInternal()

Xref: 5619253

* refactor: restore node buffer span util

* refactor: remove redundant span wrapper

* empty commit to force the Valid Backport check to rerun 🤷
This commit is contained in:
Charles Kerr 2024-10-29 14:51:59 -05:00 • committed by GitHub
parent bc90b60005
commit 1cbd5f451a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
filenames.gni
View file

@ -678,8 +678,8 @@ filenames = {
"shell/common/skia_util.cc", "shell/common/skia_util.cc",
"shell/common/skia_util.h", "shell/common/skia_util.h",
"shell/common/thread_restrictions.h", "shell/common/thread_restrictions.h",
"shell/common/v8_value_serializer.cc", "shell/common/v8_util.cc",
"shell/common/v8_value_serializer.h", "shell/common/v8_util.h",
"shell/common/world_ids.h", "shell/common/world_ids.h",
"shell/renderer/api/context_bridge/object_cache.cc", "shell/renderer/api/context_bridge/object_cache.cc",
"shell/renderer/api/context_bridge/object_cache.h", "shell/renderer/api/context_bridge/object_cache.h",

2
shell/browser/api/electron_api_app.cc
View file

@ -79,7 +79,7 @@
#include "shell/common/options_switches.h" #include "shell/common/options_switches.h"
#include "shell/common/platform_util.h" #include "shell/common/platform_util.h"
#include "shell/common/thread_restrictions.h" #include "shell/common/thread_restrictions.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "ui/gfx/image/image.h" #include "ui/gfx/image/image.h"
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)

2
shell/browser/api/electron_api_utility_process.cc
View file

@ -29,7 +29,7 @@
#include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/dictionary.h"
#include "shell/common/gin_helper/object_template_builder.h" #include "shell/common/gin_helper/object_template_builder.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "third_party/blink/public/common/messaging/message_port_descriptor.h" #include "third_party/blink/public/common/messaging/message_port_descriptor.h"
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h" #include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"

2
shell/browser/api/electron_api_web_contents.cc
View file

@ -128,7 +128,7 @@
#include "shell/common/options_switches.h" #include "shell/common/options_switches.h"
#include "shell/common/process_util.h" #include "shell/common/process_util.h"
#include "shell/common/thread_restrictions.h" #include "shell/common/thread_restrictions.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "storage/browser/file_system/isolated_context.h" #include "storage/browser/file_system/isolated_context.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/public/common/input/web_input_event.h"

2
shell/browser/api/electron_api_web_frame_main.cc
View file

@ -29,7 +29,7 @@
#include "shell/common/gin_helper/object_template_builder.h" #include "shell/common/gin_helper/object_template_builder.h"
#include "shell/common/gin_helper/promise.h" #include "shell/common/gin_helper/promise.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
namespace gin { namespace gin {

2
shell/browser/api/message_port.cc
View file

@ -21,7 +21,7 @@
#include "shell/common/gin_helper/error_thrower.h" #include "shell/common/gin_helper/error_thrower.h"
#include "shell/common/gin_helper/event_emitter_caller.h" #include "shell/common/gin_helper/event_emitter_caller.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "third_party/blink/public/common/messaging/transferable_message.h" #include "third_party/blink/public/common/messaging/transferable_message.h"
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h" #include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"
#include "third_party/blink/public/mojom/messaging/transferable_message.mojom.h" #include "third_party/blink/public/mojom/messaging/transferable_message.mojom.h"

2
shell/common/gin_converters/blink_converter.cc
View file

@ -21,7 +21,7 @@
#include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_converters/value_converter.h"
#include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/dictionary.h"
#include "shell/common/keyboard_util.h" #include "shell/common/keyboard_util.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "third_party/blink/public/common/context_menu_data/edit_flags.h" #include "third_party/blink/public/common/context_menu_data/edit_flags.h"
#include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/public/common/input/web_input_event.h"
#include "third_party/blink/public/common/input/web_keyboard_event.h" #include "third_party/blink/public/common/input/web_keyboard_event.h"

6
shell/common/gin_converters/net_converter.cc
View file

@ -32,6 +32,7 @@
#include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_converters/value_converter.h"
#include "shell/common/gin_helper/promise.h" #include "shell/common/gin_helper/promise.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/v8_util.h"
namespace gin { namespace gin {
@ -366,10 +367,7 @@ class ChunkedDataPipeReadableStream final
num_bytes = *size_ - bytes_read_; num_bytes = *size_ - bytes_read_;
MojoResult rv = data_pipe_->ReadData( MojoResult rv = data_pipe_->ReadData(
MOJO_READ_DATA_FLAG_NONE, MOJO_READ_DATA_FLAG_NONE,
base::span(static_cast<uint8_t*>(buf->Buffer()->Data()), electron::util::as_byte_span(buf).first(num_bytes), num_bytes);
buf->ByteLength())
.subspan(buf->ByteOffset(), num_bytes),
num_bytes);
if (rv == MOJO_RESULT_OK) { if (rv == MOJO_RESULT_OK) {
bytes_read_ += num_bytes; bytes_read_ += num_bytes;
// Not needed for correctness, but this allows the consumer to send the // Not needed for correctness, but this allows the consumer to send the

21
shell/common/v8_value_serializer.cc → shell/common/v8_util.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by the MIT license that can be // Use of this source code is governed by the MIT license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -240,4 +240,23 @@ v8::Local<v8::Value> DeserializeV8Value(v8::Isolate* isolate,
return V8Deserializer(isolate, data).Deserialize(); return V8Deserializer(isolate, data).Deserialize();
} }
namespace util {
/**
* SAFETY: There is not yet any v8::ArrayBufferView API that passes the
* UNSAFE_BUFFER_USAGE test, so let's isolate the unsafe API here.
*
* Where possible, Electron should use spans returned here instead of
* |v8::ArrayBufferView::Buffer()->Data()|,
* |v8::ArrayBufferView::ByteOffset()|,
* |v8::ArrayBufferView::ByteLength()|.
*/
base::span<uint8_t> as_byte_span(v8::Local<v8::ArrayBufferView> val) {
uint8_t* data =
static_cast<uint8_t*>(val->Buffer()->Data()) + val->ByteOffset();
const size_t size = val->ByteLength();
return UNSAFE_BUFFERS(base::span{data, size});
}
} // namespace util
} // namespace electron } // namespace electron

7
shell/common/v8_value_serializer.h → shell/common/v8_util.h
View file

@ -9,6 +9,7 @@
#include "ui/gfx/image/image_skia_rep.h" #include "ui/gfx/image/image_skia_rep.h"
namespace v8 { namespace v8 {
class ArrayBufferView;
class Isolate; class Isolate;
template <class T> template <class T>
class Local; class Local;
@ -29,6 +30,12 @@ v8::Local<v8::Value> DeserializeV8Value(v8::Isolate* isolate,
v8::Local<v8::Value> DeserializeV8Value(v8::Isolate* isolate, v8::Local<v8::Value> DeserializeV8Value(v8::Isolate* isolate,
base::span<const uint8_t> data); base::span<const uint8_t> data);
namespace util {
[[nodiscard]] base::span<uint8_t> as_byte_span(
v8::Local<v8::ArrayBufferView> abv);
} // namespace util
} // namespace electron } // namespace electron
#endif // ELECTRON_SHELL_COMMON_V8_VALUE_SERIALIZER_H_ #endif // ELECTRON_SHELL_COMMON_V8_VALUE_SERIALIZER_H_

2
shell/renderer/api/electron_api_ipc_renderer.cc
View file

@ -20,7 +20,7 @@
#include "shell/common/gin_helper/promise.h" #include "shell/common/gin_helper/promise.h"
#include "shell/common/node_bindings.h" #include "shell/common/node_bindings.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/blink/public/web/web_message_port_converter.h" #include "third_party/blink/public/web/web_message_port_converter.h"

2
shell/renderer/electron_api_service_impl.cc
View file

@ -20,7 +20,7 @@
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/options_switches.h" #include "shell/common/options_switches.h"
#include "shell/common/thread_restrictions.h" #include "shell/common/thread_restrictions.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "shell/renderer/electron_render_frame_observer.h" #include "shell/renderer/electron_render_frame_observer.h"
#include "shell/renderer/renderer_client_base.h" #include "shell/renderer/renderer_client_base.h"
#include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-shared.h" #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-shared.h"

2
shell/services/node/parent_port.cc
View file

@ -13,7 +13,7 @@
#include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/dictionary.h"
#include "shell/common/gin_helper/event_emitter_caller.h" #include "shell/common/gin_helper/event_emitter_caller.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/v8_value_serializer.h" #include "shell/common/v8_util.h"
#include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h" #include "third_party/blink/public/common/messaging/transferable_message_mojom_traits.h"
namespace electron { namespace electron {