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

refactor: use base::as_string_view() (#45745)

Browse source 
Use `base::as_string_view()` as a safer alternative to `reinterpret_cast`
in a couple of places.

Xref: 5472408

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2025-02-21 10:14:05 -06:00 • committed by GitHub
parent 02b85f1e6d
commit 8934eb1af5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_debugger.cc
View file

@ -8,6 +8,7 @@
#include <string_view> #include <string_view>
#include <utility> #include <utility>
#include "base/containers/span.h"
#include "base/json/json_reader.h" #include "base/json/json_reader.h"
#include "base/json/json_writer.h" #include "base/json/json_writer.h"
#include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_agent_host.h"
@ -44,8 +45,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
std::string_view message_str(reinterpret_cast<const char*>(message.data()), const std::string_view message_str = base::as_string_view(message);
message.size());
std::optional<base::Value> parsed_message = base::JSONReader::Read( std::optional<base::Value> parsed_message = base::JSONReader::Read(
message_str, base::JSON_REPLACE_INVALID_CHARACTERS); message_str, base::JSON_REPLACE_INVALID_CHARACTERS);
if (!parsed_message || !parsed_message->is_dict()) if (!parsed_message || !parsed_message->is_dict())

4
shell/browser/ui/inspectable_web_contents.cc
View file

@ -12,6 +12,7 @@
#include <utility> #include <utility>
#include "base/base64.h" #include "base/base64.h"
#include "base/containers/span.h"
#include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr.h"
#include "base/metrics/histogram.h" #include "base/metrics/histogram.h"
#include "base/strings/pattern.h" #include "base/strings/pattern.h"
@ -903,8 +904,7 @@ void InspectableWebContents::DispatchProtocolMessage(
if (!frontend_loaded_) if (!frontend_loaded_)
return; return;
const std::string_view str_message{ const std::string_view str_message = base::as_string_view(message);
reinterpret_cast<const char*>(message.data()), message.size()};
if (str_message.length() < kMaxMessageChunkSize) { if (str_message.length() < kMaxMessageChunkSize) {
CallClientFunction("DevToolsAPI", "dispatchMessage", CallClientFunction("DevToolsAPI", "dispatchMessage",
base::Value(std::string(str_message))); base::Value(std::string(str_message)));