Merge pull request #2091 from martinetd/config-block-use-after-free

sway/config: fix use-after-free for end of block

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:;