From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 12 May 2012 06:23:37 +0000 (+0200)
Subject: i3bar: Don’t crash when full_text is missing or null in the JSON input (Thanks fernan... 
X-Git-Tag: 4.3~226^2^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=156a06e4958b1550dc8448556730e80b8b551289;p=i3%2Fi3

i3bar: Don’t crash when full_text is missing or null in the JSON input (Thanks fernandotcl)
---

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 0b6f07df..c2be484b 100644
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -128,6 +128,10 @@ static int stdin_end_map(void *context) {
     parser_ctx *ctx = context;
     struct status_block *new_block = smalloc(sizeof(struct status_block));
     memcpy(new_block, &(ctx->block), sizeof(struct status_block));
+    /* Ensure we have a full_text set, so that when it is missing (or null),
+     * i3bar doesn’t crash and the user gets an annoying message. */
+    if (!new_block->full_text)
+        new_block->full_text = sstrdup("SPEC VIOLATION (null)");
     TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks);
     return 1;
 }