mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1283 from 4e554c4c/memory_leak

Browse source 
Fix memory leaks in swaybar tray
This commit is contained in:
Drew DeVault 2017-07-16 22:25:28 -04:00 committed by GitHub
commit 1e13a1fd60
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
swaybar/event_loop.c
View file

@ -105,6 +105,7 @@ static int timer_item_timer_cmp(const void *_timer_item, const void *_timer) {
bool remove_timer(timer_t timer) { bool remove_timer(timer_t timer) {
int index = list_seq_find(event_loop.timers, timer_item_timer_cmp, &timer); int index = list_seq_find(event_loop.timers, timer_item_timer_cmp, &timer);
if (index != -1) { if (index != -1) {
free(event_loop.timers->items[index]);
list_del(event_loop.timers, index); list_del(event_loop.timers, index);
return true; return true;
} }

4
swaybar/tray/dbus.c
View file

@ -108,7 +108,7 @@ static dbus_bool_t add_timeout(DBusTimeout *timeout, void *_data) {
timer_settime(*timer, 0, &time, NULL); timer_settime(*timer, 0, &time, NULL);
dbus_timeout_set_data(timeout, timer, free); dbus_timeout_set_data(timeout, timer, NULL);
sway_log(L_DEBUG, "Adding DBus timeout. Interval: %ds %dms", interval_sec, interval_msec); sway_log(L_DEBUG, "Adding DBus timeout. Interval: %ds %dms", interval_sec, interval_msec);
add_timer(*timer, dispatch_timeout, timeout); add_timer(*timer, dispatch_timeout, timeout);
@ -121,6 +121,8 @@ static void remove_timeout(DBusTimeout *timeout, void *_data) {
if (timer) { if (timer) {
remove_timer(*timer); remove_timer(*timer);
timer_delete(*timer);
free(timer);
} }
} }

4
swaybar/tray/sni.c
View file

@ -160,6 +160,7 @@ static void reply_icon(DBusPendingCall *pending, void *_data) {
dirty = true; dirty = true;
dbus_message_unref(reply); dbus_message_unref(reply);
dbus_pending_call_unref(pending);
return; return;
} else { } else {
sway_log(L_ERROR, "Could not create image surface"); sway_log(L_ERROR, "Could not create image surface");
@ -170,6 +171,7 @@ bail:
if (reply) { if (reply) {
dbus_message_unref(reply); dbus_message_unref(reply);
} }
dbus_pending_call_unref(pending);
sway_log(L_ERROR, "Could not get icon from item"); sway_log(L_ERROR, "Could not get icon from item");
return; return;
} }
@ -266,6 +268,7 @@ static void reply_icon_name(DBusPendingCall *pending, void *_data) {
dirty = true; dirty = true;
dbus_message_unref(reply); dbus_message_unref(reply);
dbus_pending_call_unref(pending);
return; return;
} }
@ -273,6 +276,7 @@ bail:
if (reply) { if (reply) {
dbus_message_unref(reply); dbus_message_unref(reply);
} }
dbus_pending_call_unref(pending);
// Now try the pixmap // Now try the pixmap
send_icon_msg(item); send_icon_msg(item);
return; return;

1
swaybar/tray/tray.c
View file

@ -99,6 +99,7 @@ static void get_items_reply(DBusPendingCall *pending, void *_data) {
bail: bail:
dbus_message_unref(reply); dbus_message_unref(reply);
dbus_pending_call_unref(pending);
return; return;
} }
static void get_items() { static void get_items() {