Skip to content

fix(tray): segfault due to use-after-free from iterating children #5115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaschiu wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −4
Open

fix(tray): segfault due to use-after-free from iterating children #5115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc03fb5
Update tray.hpp
jaschiu Jun 9, 2026
9b70c57
Update tray.cpp
jaschiu Jun 9, 2026
67b677c
Update tray.cpp
jaschiu Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/modules/sni/tray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class Tray : public AModule {
Gtk::Box box_;
SNI::Watcher::singleton watcher_;
SNI::Host host_;
std::vector<Item*> items_;
};

} // namespace waybar::modules::SNI
9 changes: 5 additions & 4 deletions src/modules/sni/tray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,23 @@ void Tray::onAdd(std::unique_ptr<Item>& item) {
} else {
box_.pack_start(item->event_box);
}
items_.push_back(item.get());
dp.emit();
}

void Tray::onRemove(std::unique_ptr<Item>& item) {
box_.remove(item->event_box);
items_.erase(std::remove(items._begin(), items_.end(), item.get()), items_.end());
dp.emit();
}

auto Tray::update() -> void {
// Show tray only when items are available
std::vector<Gtk::Widget*> children = box_.get_children();
if (show_passive_) {
event_box_.set_visible(!children.empty());
event_box_.set_visible(!items_.empty());
} else {
event_box_.set_visible(!std::all_of(children.begin(), children.end(), [](Gtk::Widget* child) {
return child->get_style_context()->has_class("passive");
event_box_.set_visible(!std::all_of(items_.begin(), items_.end(), [](Item* item) {
return item->event_box.get_style_context()->has_class("passive");
}));
}

Expand Down