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

🏁🐛 Buffer overflows in tooltips

Browse source 
Fixes #3290.
This commit is contained in:
mgarciaisaia 2015-11-04 01:09:05 -03:00 • committed by Cheng Zhao
parent 28abc8defe
commit 4013b652ff
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/win/notify_icon.cc
View file

@ -113,7 +113,7 @@ void NotifyIcon::SetToolTip(const std::string& tool_tip) {
NOTIFYICONDATA icon_data; NOTIFYICONDATA icon_data;
InitIconData(&icon_data); InitIconData(&icon_data);
icon_data.uFlags |= NIF_TIP; icon_data.uFlags |= NIF_TIP;
wcscpy_s(icon_data.szTip, base::UTF8ToUTF16(tool_tip).c_str()); wcsncpy_s(icon_data.szTip, base::UTF8ToUTF16(tool_tip).c_str(), _TRUNCATE);
BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data); BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data);
if (!result) if (!result)
LOG(WARNING) << "Unable to set tooltip for status tray icon"; LOG(WARNING) << "Unable to set tooltip for status tray icon";
@ -126,8 +126,8 @@ void NotifyIcon::DisplayBalloon(const gfx::Image& icon,
InitIconData(&icon_data); InitIconData(&icon_data);
icon_data.uFlags |= NIF_INFO; icon_data.uFlags |= NIF_INFO;
icon_data.dwInfoFlags = NIIF_INFO; icon_data.dwInfoFlags = NIIF_INFO;
wcscpy_s(icon_data.szInfoTitle, title.c_str()); wcsncpy_s(icon_data.szInfoTitle, title.c_str(), _TRUNCATE);
wcscpy_s(icon_data.szInfo, contents.c_str()); wcsncpy_s(icon_data.szInfo, contents.c_str(), _TRUNCATE);
icon_data.uTimeout = 0; icon_data.uTimeout = 0;
base::win::Version win_version = base::win::GetVersion(); base::win::Version win_version = base::win::GetVersion();

3
atom/browser/ui/win/taskbar_host.cc
View file

@ -97,7 +97,8 @@ bool TaskbarHost::SetThumbarButtons(
// Set tooltip. // Set tooltip.
if (!button.tooltip.empty()) { if (!button.tooltip.empty()) {
thumb_button.dwMask |= THB_TOOLTIP; thumb_button.dwMask |= THB_TOOLTIP;
wcscpy_s(thumb_button.szTip, base::UTF8ToUTF16(button.tooltip).c_str()); wcsncpy_s(thumb_button.szTip, base::UTF8ToUTF16(button.tooltip).c_str(),
_TRUNCATE);
} }
// Save callback. // Save callback.