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

fix: wide string concatenation (#40892)

Browse source 
* fix: wide string concatenation

* Use wstring_views to keep length in context

* forgot a space, oopsies
This commit is contained in:
Calvin 2024-01-07 22:02:20 -08:00 committed by GitHub
parent 3a22fd3216
commit 37630a6128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
shell/browser/browser_win.cc
View file

@ -19,8 +19,8 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "base/strings/strcat_win.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h" #include "base/win/registry.h"
#include "base/win/win_util.h" #include "base/win/win_util.h"
@ -68,13 +68,13 @@ bool GetProtocolLaunchPath(gin::Arguments* args, std::wstring* exe) {
// Read in optional args arg // Read in optional args arg
std::vector<std::wstring> launch_args; std::vector<std::wstring> launch_args;
if (args->GetNext(&launch_args) && !launch_args.empty()) if (args->GetNext(&launch_args) && !launch_args.empty()) {
*exe = base::UTF8ToWide( std::wstring joined_args = base::JoinString(launch_args, L"\" \"");
base::StringPrintf("\"%ls\" \"%ls\" \"%%1\"", exe->c_str(), *exe = base::StrCat({L"\"", *exe, L"\" \"", joined_args, L"\" \"%1\""});
base::JoinString(launch_args, L"\" \"").c_str())); } else {
else *exe = base::StrCat({L"\"", *exe, L"\" \"%1\""});
*exe = }
base::UTF8ToWide(base::StringPrintf("\"%ls\" \"%%1\"", exe->c_str()));
return true; return true;
} }
@ -142,8 +142,7 @@ bool FormatCommandLineString(std::wstring* exe,
if (!launch_args.empty()) { if (!launch_args.empty()) {
std::u16string joined_launch_args = base::JoinString(launch_args, u" "); std::u16string joined_launch_args = base::JoinString(launch_args, u" ");
*exe = base::UTF8ToWide(base::StringPrintf( *exe = base::StrCat({*exe, L" ", base::AsWStringView(joined_launch_args)});
"%ls %ls", exe->c_str(), base::as_wcstr(joined_launch_args)));
} }
return true; return true;

7
shell/browser/relauncher_win.cc
View file

@ -8,7 +8,8 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/process/launch.h" #include "base/process/launch.h"
#include "base/strings/stringprintf.h" #include "base/strings/strcat_win.h"
#include "base/strings/string_number_conversions_win.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_handle.h" #include "base/win/scoped_handle.h"
#include "sandbox/win/src/nt_internals.h" #include "sandbox/win/src/nt_internals.h"
@ -109,8 +110,8 @@ StringType AddQuoteForArg(const StringType& arg) {
} // namespace } // namespace
StringType GetWaitEventName(base::ProcessId pid) { StringType GetWaitEventName(base::ProcessId pid) {
return base::UTF8ToWide( return base::StrCat(
base::StringPrintf("%ls-%d", kWaitEventName, static_cast<int>(pid))); {kWaitEventName, L"-", base::NumberToWString(static_cast<int>(pid))});
} }
StringType ArgvToCommandLineString(const StringVector& argv) { StringType ArgvToCommandLineString(const StringVector& argv) {