blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SEGFAULT in battery module 

In waybar::modules::Battery::~Battery(), store a copy of the batteries_
iterator before calling erase(), as erase() invalidates the iterator.

Prior to this change, disconnecting outputs resulted in a SEGFAULT when
using the battery module; e.g.,

    [debug] Received SIGCHLD in signalThread
    [debug] Cmd exited with code 0
    [debug] Received SIGCHLD in signalThread
    [debug] Cmd exited with code 0
    [debug] Received SIGCHLD in signalThread
    [debug] Cmd exited with code 0
    [debug] Output removed: AU Optronics 0x2336
    [info] Bar configured (width: 1280, height: 25) for output: eDP-1
    [info] Bar configured (width: 1280, height: 25) for output: eDP-1
    zsh: segmentation fault (core dumped)  ./build/waybar -l trace

Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
This commit is contained in:
Lukas Fleischer 2023-05-22 10:02:14 -04:00
parent 2b24b16023
commit 75eacb95ef
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/battery.cpp
View File

@ -36,7 +36,8 @@ waybar::modules::Battery::~Battery() {
} }
close(global_watch_fd_); close(global_watch_fd_);
for (auto it = batteries_.cbegin(); it != batteries_.cend(); it++) { for (auto it = batteries_.cbegin(), next_it = it; it != batteries_.cend(); it = next_it) {
++next_it;
auto watch_id = (*it).second; auto watch_id = (*it).second;
if (watch_id >= 0) { if (watch_id >= 0) {
inotify_rm_watch(battery_watch_fd_, watch_id); inotify_rm_watch(battery_watch_fd_, watch_id);