Merge pull request #1574 from acrisci/bug/bar-text-null-check

i3bar: check block text for NULL

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 402e6351bd3fd085134278c066b4a50d7ddf9307..5347632ad6490d92edcbdd7ebc8bb4d3dfef132a 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -265,7 +265,9 @@ static int stdin_end_map(void *context) {
     }
 
     i3string_set_markup(new_block->full_text, new_block->is_markup);
-    i3string_set_markup(new_block->short_text, new_block->is_markup);
+
+    if (new_block->short_text != NULL)
+        i3string_set_markup(new_block->short_text, new_block->is_markup);
 
     TAILQ_INSERT_TAIL(&statusline_buffer, new_block, blocks);
     return 1;
@@ -284,7 +286,7 @@ static int stdin_end_array(void *context) {
     struct status_block *current;
     TAILQ_FOREACH(current, &statusline_head, blocks) {
         DLOG("full_text = %s\n", i3string_as_utf8(current->full_text));
-        DLOG("short_text = %s\n", i3string_as_utf8(current->short_text));
+        DLOG("short_text = %s\n", (current->short_text == NULL ? NULL : i3string_as_utf8(current->short_text)));
         DLOG("color = %s\n", current->color);
     }
     DLOG("end of dump\n");