From b66c51ea2cf67989f77d8094821c0f66b64571a0 Mon Sep 17 00:00:00 2001 From: progandy Date: Thu, 24 Dec 2015 01:21:29 +0100 Subject: [PATCH] swaybar: fix array indices in i3json_handle --- swaybar/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/swaybar/main.c b/swaybar/main.c index 74930075..110904ba 100644 --- a/swaybar/main.c +++ b/swaybar/main.c @@ -425,9 +425,9 @@ void render() { cairo_set_source_u32(window->cairo, colors.separator); cairo_set_line_width(window->cairo, 1); cairo_move_to(window->cairo, blockpos + width - + block->separator_block_width/2, margin); + + block->separator_block_width/2, margin); cairo_line_to(window->cairo, blockpos + width - + block->separator_block_width/2, window->height - margin); + + block->separator_block_width/2, window->height - margin); cairo_stroke(window->cairo); } } @@ -659,11 +659,11 @@ int i3json_handle(FILE *file) { } --i3json_state.depth; if (i3json_state.depth == 1) { - ssize_t len = c-i3json_state.line_start+1; - char p = c[len]; - c[len] = '\0'; + // c[1] is valid since c[0] != '\0' + char p = c[1]; + c[1] = '\0'; parse_json(i3json_state.line_start); - c[len] = p; + c[1] = p; ++handled; i3json_state.line_start = c+1; }