Merge pull request #2783 from martinetd/swaynag_uaf

swaynag: fix use-after-free in wl_display_dispatch
This commit is contained in:
emersion 2018-10-07 09:57:51 +02:00 committed by GitHub
commit 06fade1c8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);
}
}