nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4004 from orestisfl/i3bar-segfault 

Fix SEGFAULT when i3bar receives invalid input
This commit is contained in:
Ingo Bürk 2020-04-10 14:00:51 +02:00 committed by GitHub
parent 312d3dfbd3 91ec14f2bc
commit e2b2a28625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
i3bar/src/child.c
View File

@ -196,6 +196,11 @@ static int stdin_map_key(void *context, const unsigned char *key, size_t len) {
static int stdin_boolean(void *context, int val) { static int stdin_boolean(void *context, int val) {
parser_ctx *ctx = context; parser_ctx *ctx = context;
if (!ctx->last_map_key) {
return 0;
}
if (strcasecmp(ctx->last_map_key, "urgent") == 0) { if (strcasecmp(ctx->last_map_key, "urgent") == 0) {
ctx->block.urgent = val; ctx->block.urgent = val;
return 1; return 1;
@ -210,6 +215,11 @@ static int stdin_boolean(void *context, int val) {
static int stdin_string(void *context, const unsigned char *val, size_t len) { static int stdin_string(void *context, const unsigned char *val, size_t len) {
parser_ctx *ctx = context; parser_ctx *ctx = context;
if (!ctx->last_map_key) {
return 0;
}
if (strcasecmp(ctx->last_map_key, "full_text") == 0) { if (strcasecmp(ctx->last_map_key, "full_text") == 0) {
ctx->block.full_text = i3string_from_markup_with_length((const char *)val, len); ctx->block.full_text = i3string_from_markup_with_length((const char *)val, len);
return 1; return 1;
@ -262,6 +272,11 @@ static int stdin_string(void *context, const unsigned char *val, size_t len) {
static int stdin_integer(void *context, long long val) { static int stdin_integer(void *context, long long val) {
parser_ctx *ctx = context; parser_ctx *ctx = context;
if (!ctx->last_map_key) {
return 0;
}
if (strcasecmp(ctx->last_map_key, "min_width") == 0) { if (strcasecmp(ctx->last_map_key, "min_width") == 0) {
ctx->block.min_width = (uint32_t)val; ctx->block.min_width = (uint32_t)val;
return 1; return 1;