diff options
author | 2015-12-18 09:42:54 -0500 | |
---|---|---|
committer | 2015-12-18 09:42:54 -0500 | |
commit | 73c8a484172e08a3d6ce4f32bde96642231908f9 (patch) | |
tree | ed139c11ee50719be67f69d64f4819ca574d097a /swaybar/main.c | |
parent | Fix possible segfault in swaybar (diff) | |
parent | swaybar: ipc_update_ws: Fix memory corruption. (diff) | |
download | sway-73c8a484172e08a3d6ce4f32bde96642231908f9.tar.gz sway-73c8a484172e08a3d6ce4f32bde96642231908f9.tar.zst sway-73c8a484172e08a3d6ce4f32bde96642231908f9.zip |
Merge pull request #357 from sce/fix_swaybar_crashes
swaybar: ipc_update_ws: Fix memory corruption.
Diffstat (limited to 'swaybar/main.c')
-rw-r--r-- | swaybar/main.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/swaybar/main.c b/swaybar/main.c index c0a24bcf..f9387b3c 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -135,10 +135,6 @@ void ipc_update_workspaces() { | |||
135 | int i; | 135 | int i; |
136 | for (i = 0; i < json_object_array_length(results); ++i) { | 136 | for (i = 0; i < json_object_array_length(results); ++i) { |
137 | json_object *ws_json = json_object_array_get_idx(results, i); | 137 | json_object *ws_json = json_object_array_get_idx(results, i); |
138 | if (!ws_json) { | ||
139 | // wat | ||
140 | continue; | ||
141 | } | ||
142 | json_object *num, *name, *visible, *focused, *out, *urgent; | 138 | json_object *num, *name, *visible, *focused, *out, *urgent; |
143 | json_object_object_get_ex(ws_json, "num", &num); | 139 | json_object_object_get_ex(ws_json, "num", &num); |
144 | json_object_object_get_ex(ws_json, "name", &name); | 140 | json_object_object_get_ex(ws_json, "name", &name); |
@@ -156,14 +152,6 @@ void ipc_update_workspaces() { | |||
156 | ws->urgent = json_object_get_boolean(urgent); | 152 | ws->urgent = json_object_get_boolean(urgent); |
157 | list_add(workspaces, ws); | 153 | list_add(workspaces, ws); |
158 | } | 154 | } |
159 | |||
160 | json_object_put(num); | ||
161 | json_object_put(name); | ||
162 | json_object_put(visible); | ||
163 | json_object_put(focused); | ||
164 | json_object_put(out); | ||
165 | json_object_put(urgent); | ||
166 | json_object_put(ws_json); | ||
167 | } | 155 | } |
168 | 156 | ||
169 | json_object_put(results); | 157 | json_object_put(results); |