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

build: match upstream with unsafe buffer paths (#45853)

Browse source 
* build: match upstream with unsafe buffer paths

* Don't assume STL iterators are pointers

Refs https://issues.chromium.org/issues/328308661

* chore: spanify process_singleton_win.cc
This commit is contained in:
Robo 2025-03-07 06:04:18 +09:00 • committed by GitHub
parent d987bee007
commit 041ada1586
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 44 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -405,7 +405,7 @@ int GetPathConstant(std::string_view name) {
{"videos", chrome::DIR_USER_VIDEOS},
});
// clang-format on
const auto* iter = Lookup.find(name);
auto iter = Lookup.find(name);
return iter != Lookup.end() ? iter->second : -1;
}

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

@ -129,7 +129,7 @@ std::string SystemPreferences::GetColor(gin_helper::ErrorThrower thrower,
{"window-text", COLOR_WINDOWTEXT},
});
if (const auto* iter = Lookup.find(color); iter != Lookup.end())
if (auto iter = Lookup.find(color); iter != Lookup.end())
return ToRGBAHex(color_utils::GetSysSkColor(iter->second));
thrower.ThrowError("Unknown color: " + color);

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

@ -80,7 +80,7 @@ struct UserData : public base::SupportsUserData::Data {
};
extensions::WebRequestResourceType ParseResourceType(std::string_view value) {
if (const auto* iter = ResourceTypes.find(value); iter != ResourceTypes.end())
if (auto iter = ResourceTypes.find(value); iter != ResourceTypes.end())
return iter->second;
return extensions::WebRequestResourceType::OTHER;

2
shell/browser/ui/views/client_frame_view_linux.cc
View file

@ -416,7 +416,7 @@ void ClientFrameViewLinux::LayoutButtonsOnSide(
}
for (views::FrameButton frame_button : frame_buttons) {
auto* button =
auto button =
std::ranges::find_if(nav_buttons_, [&](const NavButton& test) {
return test.type != skip_type && test.frame_button == frame_button;
});

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

@ -568,7 +568,7 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
{"no-cors", Val::kNoCors},
{"same-origin", Val::kSameOrigin},
});
if (auto* iter = Lookup.find(mode); iter != Lookup.end())
if (auto iter = Lookup.find(mode); iter != Lookup.end())
request->mode = iter->second;
}
@ -597,7 +597,7 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
{"worker", Val::kWorker},
{"xslt", Val::kXslt},
});
if (auto* iter = Lookup.find(destination); iter != Lookup.end())
if (auto iter = Lookup.find(destination); iter != Lookup.end())
request->destination = iter->second;
}

2
shell/common/gin_converters/std_converter.h
View file

@ -224,7 +224,7 @@ bool FromV8WithLookup(v8::Isolate* isolate,
if (key_transform)
key_transform(key);
if (const auto* iter = table.find(key); iter != table.end()) {
if (auto iter = table.find(key); iter != table.end()) {
*out = iter->second;
return true;
}

2
shell/common/keyboard_util.cc
View file

@ -108,7 +108,7 @@ CodeAndShiftedChar KeyboardCodeFromKeyIdentifier(const std::string_view str) {
{"volumeup", {ui::VKEY_VOLUME_UP, {}}},
});
if (auto* const iter = Lookup.find(str); iter != Lookup.end())
if (auto iter = Lookup.find(str); iter != Lookup.end())
return iter->second;
return {ui::VKEY_UNKNOWN, {}};