mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #357 from sce/fix_swaybar_crashes

Browse source 
swaybar: ipc_update_ws: Fix memory corruption.
This commit is contained in:
Drew DeVault 2015-12-18 09:42:54 -05:00
commit 73c8a48417
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
swaybar/main.c
View file

@ -135,10 +135,6 @@ void ipc_update_workspaces() {
int i; int i;
for (i = 0; i < json_object_array_length(results); ++i) { for (i = 0; i < json_object_array_length(results); ++i) {
json_object *ws_json = json_object_array_get_idx(results, i); json_object *ws_json = json_object_array_get_idx(results, i);
if (!ws_json) {
// wat
continue;
}
json_object *num, *name, *visible, *focused, *out, *urgent; json_object *num, *name, *visible, *focused, *out, *urgent;
json_object_object_get_ex(ws_json, "num", &num); json_object_object_get_ex(ws_json, "num", &num);
json_object_object_get_ex(ws_json, "name", &name); json_object_object_get_ex(ws_json, "name", &name);
@ -156,14 +152,6 @@ void ipc_update_workspaces() {
ws->urgent = json_object_get_boolean(urgent); ws->urgent = json_object_get_boolean(urgent);
list_add(workspaces, ws); list_add(workspaces, ws);
} }
json_object_put(num);
json_object_put(name);
json_object_put(visible);
json_object_put(focused);
json_object_put(out);
json_object_put(urgent);
json_object_put(ws_json);
} }
json_object_put(results); json_object_put(results);