1 files changed, 25 insertions, 14 deletions

diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 6bbe9408..03500bdf 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809
 #include <limits.h>
 #include <poll.h>
 #include <stdio.h>
@@ -147,8 +146,10 @@ static bool ipc_parse_config(
 
         json_object *font = json_object_object_get(bar_config, "font");
         if (font) {
-                free(config->font);
-                config->font = parse_font(json_object_get_string(font));
+                pango_font_description_free(config->font_description);
+                char *font_value = parse_font(json_object_get_string(font));
+                config->font_description = pango_font_description_from_string(font_value);
+                free(font_value);
         }
 
         json_object *gaps = json_object_object_get(bar_config, "gaps");
@@ -424,12 +425,9 @@ bool ipc_initialize(struct swaybar *bar) {
         }
         free(res);
 
-        struct swaybar_config *config = bar->config;
-        char subscribe[128]; // suitably large buffer
-        len = snprintf(subscribe, 128,
-                        "[ \"barconfig_update\" , \"bar_state_update\" %s %s ]",
-                        config->binding_mode_indicator ? ", \"mode\"" : "",
-                        config->workspace_buttons ? ", \"workspace\"" : "");
+        char *subscribe =
+                "[ \"barconfig_update\", \"bar_state_update\", \"mode\", \"workspace\" ]";
+        len = strlen(subscribe);
         free(ipc_single_command(bar->ipc_event_socketfd,
                         IPC_SUBSCRIBE, subscribe, &len));
         return true;
@@ -485,8 +483,7 @@ static bool handle_barconfig_update(struct swaybar *bar, const char *payload,
                         destroy_layer_surface(output);
                         wl_list_remove(&output->link);
                         wl_list_insert(&bar->unused_outputs, &output->link);
-                } else if (!oldcfg->font || !newcfg->font ||
-                                strcmp(oldcfg->font, newcfg->font) != 0) {
+                } else if (!pango_font_description_equal(oldcfg->font_description, newcfg->font_description)) {
                         output->height = 0;  // force update height
                 }
         }
@@ -547,9 +544,23 @@ bool handle_ipc_readable(struct swaybar *bar) {
                 return false;
         }
 
-        json_object *result = json_tokener_parse(resp->payload);
-        if (!result) {
-                sway_log(SWAY_ERROR, "failed to parse payload as json");
+        // The default depth of 32 is too small to represent some nested layouts, but
+        // we can't pass INT_MAX here because json-c (as of this writing) prefaults
+        // all the memory for its stack.
+        json_tokener *tok = json_tokener_new_ex(JSON_MAX_DEPTH);
+        if (!tok) {
+                sway_log_errno(SWAY_ERROR, "failed to create tokener");
+                free_ipc_response(resp);
+                return false;
+        }
+
+        json_object *result = json_tokener_parse_ex(tok, resp->payload, -1);
+        enum json_tokener_error err = json_tokener_get_error(tok);
+        json_tokener_free(tok);
+
+        if (err != json_tokener_success) {
+                sway_log(SWAY_ERROR, "failed to parse payload as json: %s",
+                                json_tokener_error_desc(err));
                 free_ipc_response(resp);
                 return false;
         }