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

fix: -Wunsafe-buffer-usage warnings in url-loader (#43564)

Browse source 
Use v8::ArrayBufferView::CopyContents() instead of doing the pointer
math + memcpy() ourselves. This not only solves the buffer warnings,
but may also avoid some additional overhead:

> Copy the contents of the ArrayBufferView's buffer to an
> embedder defined memory without additional overhead that
> calling ArrayBufferView::Buffer might incur.
This commit is contained in:
Charles Kerr 2024-09-05 20:22:03 -05:00 committed by GitHub
parent eff862b083
commit 3fde574db1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
shell/common/api/electron_api_url_loader.cc
View file

@ -11,6 +11,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "base/check_op.h"
#include "base/containers/fixed_flat_map.h" #include "base/containers/fixed_flat_map.h"
#include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
@ -131,12 +132,21 @@ namespace electron::api {
namespace { namespace {
template <typename T>
auto ToVec(v8::Local<v8::ArrayBufferView> view) {
const size_t n_wanted = view->ByteLength();
std::vector<T> buf(n_wanted);
[[maybe_unused]] const auto n_got = view->CopyContents(buf.data(), n_wanted);
DCHECK_EQ(n_wanted, n_got);
DCHECK_EQ(n_wanted, std::size(buf));
return buf;
}
class BufferDataSource : public mojo::DataPipeProducer::DataSource { class BufferDataSource : public mojo::DataPipeProducer::DataSource {
public: public:
explicit BufferDataSource(base::span<char> buffer) { explicit BufferDataSource(v8::Local<v8::ArrayBufferView> buffer)
buffer_.resize(buffer.size()); : buffer_{ToVec<char>(buffer)} {}
memcpy(buffer_.data(), buffer.data(), buffer_.size());
}
~BufferDataSource() override = default; ~BufferDataSource() override = default;
private: private:
@ -247,13 +257,8 @@ class JSChunkedDataPipeGetter final
auto buffer = buffer_val.As<v8::ArrayBufferView>(); auto buffer = buffer_val.As<v8::ArrayBufferView>();
is_writing_ = true; is_writing_ = true;
bytes_written_ += buffer->ByteLength(); bytes_written_ += buffer->ByteLength();
auto backing_store = buffer->Buffer()->GetBackingStore();
auto buffer_span = base::make_span(
static_cast<char*>(backing_store->Data()) + buffer->ByteOffset(),
buffer->ByteLength());
auto buffer_source = std::make_unique<BufferDataSource>(buffer_span);
data_producer_->Write( data_producer_->Write(
std::move(buffer_source), std::make_unique<BufferDataSource>(buffer),
base::BindOnce(&JSChunkedDataPipeGetter::OnWriteChunkComplete, base::BindOnce(&JSChunkedDataPipeGetter::OnWriteChunkComplete,
// We're OK to use Unretained here because we own // We're OK to use Unretained here because we own
// |data_producer_|. // |data_producer_|.
@ -660,11 +665,9 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
v8::Local<v8::Value> chunk_pipe_getter; v8::Local<v8::Value> chunk_pipe_getter;
if (opts.Get("body", &body)) { if (opts.Get("body", &body)) {
if (body->IsArrayBufferView()) { if (body->IsArrayBufferView()) {
auto buffer_body = body.As<v8::ArrayBufferView>(); auto request_body = base::MakeRefCounted<network::ResourceRequestBody>();
auto backing_store = buffer_body->Buffer()->GetBackingStore(); request_body->AppendBytes(ToVec<uint8_t>(body.As<v8::ArrayBufferView>()));
request->request_body = network::ResourceRequestBody::CreateFromBytes( request->request_body = std::move(request_body);
static_cast<char*>(backing_store->Data()) + buffer_body->ByteOffset(),
buffer_body->ByteLength());
} else if (body->IsFunction()) { } else if (body->IsFunction()) {
auto body_func = body.As<v8::Function>(); auto body_func = body.As<v8::Function>();