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

fix: -Wunsafe-buffer-usage warnings in TaskbarHost::SetThumbarButtons() (31-x-y) (#44455)

Browse source 
fix: -Wunsafe-buffer-usage warnings in TaskbarHost::SetThumbarButtons() (#44238)

* fix: -Wunsafe-buffer-usage warnings in TaskbarHost::SetThumbarButtons()

* fixup! fix: -Wunsafe-buffer-usage warning in ChunkedDataPipeReadableStream (#44211)
This commit is contained in:
Charles Kerr 2024-10-29 15:41:36 -05:00 committed by GitHub
parent 9e9bb3dc7a
commit 17c9c79202
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
shell/browser/ui/win/taskbar_host.cc
View file

@ -5,6 +5,7 @@
#include "shell/browser/ui/win/taskbar_host.h" #include "shell/browser/ui/win/taskbar_host.h"
#include <objbase.h> #include <objbase.h>
#include <array>
#include <string> #include <string>
#include "base/stl_util.h" #include "base/stl_util.h"
@ -25,10 +26,10 @@ namespace {
// From MSDN: // From MSDN:
// https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#thumbbars // https://msdn.microsoft.com/en-us/library/windows/desktop/dd378460(v=vs.85).aspx#thumbbars
// The thumbnail toolbar has a maximum of seven buttons due to the limited room. // The thumbnail toolbar has a maximum of seven buttons due to the limited room.
const size_t kMaxButtonsCount = 7; constexpr size_t kMaxButtonsCount = 7U;
// The base id of Thumbar button. // The base id of Thumbar button.
const int kButtonIdBase = 40001; constexpr int kButtonIdBase = 40001;
bool GetThumbarButtonFlags(const std::vector<std::string>& flags, bool GetThumbarButtonFlags(const std::vector<std::string>& flags,
THUMBBUTTONFLAGS* out) { THUMBBUTTONFLAGS* out) {
@ -72,10 +73,10 @@ bool TaskbarHost::SetThumbarButtons(HWND window,
// The number of buttons in thumbar can not be changed once it is created, // The number of buttons in thumbar can not be changed once it is created,
// so we have to claim kMaxButtonsCount buttons initially in case users add // so we have to claim kMaxButtonsCount buttons initially in case users add
// more buttons later. // more buttons later.
base::win::ScopedHICON icons[kMaxButtonsCount] = {}; auto icons = std::array<base::win::ScopedHICON, kMaxButtonsCount>{};
THUMBBUTTON thumb_buttons[kMaxButtonsCount] = {}; auto thumb_buttons = std::array<THUMBBUTTON, kMaxButtonsCount>{};
for (size_t i = 0; i < kMaxButtonsCount; ++i) { for (size_t i = 0U; i < kMaxButtonsCount; ++i) {
THUMBBUTTON& thumb_button = thumb_buttons[i]; THUMBBUTTON& thumb_button = thumb_buttons[i];
// Set ID. // Set ID.
@ -118,10 +119,11 @@ bool TaskbarHost::SetThumbarButtons(HWND window,
// Finally add them to taskbar. // Finally add them to taskbar.
HRESULT r; HRESULT r;
if (thumbar_buttons_added_) { if (thumbar_buttons_added_) {
r = taskbar_->ThumbBarUpdateButtons(window, kMaxButtonsCount, r = taskbar_->ThumbBarUpdateButtons(window, thumb_buttons.size(),
thumb_buttons); thumb_buttons.data());
} else { } else {
r = taskbar_->ThumbBarAddButtons(window, kMaxButtonsCount, thumb_buttons); r = taskbar_->ThumbBarAddButtons(window, thumb_buttons.size(),
thumb_buttons.data());
} }
thumbar_buttons_added_ = true; thumbar_buttons_added_ = true;