sway

commit 5b72e8606c5a160468ffa6ec6f3327669d39257b
parent df204b65d84ba0a1d005922f0a9a616e1757d3b1
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat,  2 Jun 2018 08:39:14 -0700

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

sway/config: fix use-after-free for end of block
Diffstat:
M
sway/config.c
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git 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:;