aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-06-02 08:39:14 -0700
committerGitHub <noreply@github.com>2018-06-02 08:39:14 -0700
commit5b72e8606c5a160468ffa6ec6f3327669d39257b (patch)
treee666502f59f8224794663a23d503f0c6d4560f97
parentdf204b65d84ba0a1d005922f0a9a616e1757d3b1 (diff)
parent71ab13f1ebfa7c0d4828873f6f43a14cafa6af0e (diff)
Merge pull request #2091 from martinetd/config-block-use-after-free
sway/config: fix use-after-free for end of block
-rw-r--r--sway/config.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/config.c b/sway/config.c
index 88cc6843..445c3d55 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -626,13 +626,13 @@ bool read_config(FILE *file, struct sway_config *config) {
success = false;
break;
}
- wlr_log(L_DEBUG, "Exiting block '%s'", block);
- list_del(stack, 0);
- free(block);
-
if (strcmp(block, "bar") == 0) {
config->current_bar = NULL;
}
+
+ wlr_log(L_DEBUG, "Exiting block '%s'", block);
+ list_del(stack, 0);
+ free(block);
memset(&config->handler_context, 0,
sizeof(config->handler_context));
default:;