Merge pull request #2783 from martinetd/swaynag_uaf

swaynag: fix use-after-free in wl_display_dispatch
6 years ago · 06fade1c8b
parent 8393266eb5 e5ece5f8b3
commit 06fade1c8b
1 changed files with 4 additions and 4 deletions
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@ -390,6 +390,10 @@ void swaynag_run(struct swaynag *swaynag) {
 			&& wl_display_dispatch(swaynag->display) != -1) {
 		// This is intentionally left blank
 	}
+
+	if (swaynag->display) {
+		wl_display_disconnect(swaynag->display);
+	}
 }

 void swaynag_destroy(struct swaynag *swaynag) {
@ -449,8 +453,4 @@ void swaynag_destroy(struct swaynag *swaynag) {
 	if (swaynag->shm) {
 		wl_shm_destroy(swaynag->shm);
 	}
-
-	if (swaynag->display) {
-		wl_display_disconnect(swaynag->display);
-	}
 }