mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launcher: Don't leak tty file descriptor on launcher destroy

Browse Source
This commit is contained in:
Kristian Høgsberg 2013-10-09 11:03:39 -07:00
parent 8ac6a2da07
commit 325390e529
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/launcher-util.c
View File

@ -256,7 +256,11 @@ setup_tty(struct weston_launcher *launcher, int tty)
int ret, kd_mode; int ret, kd_mode;
if (tty == 0) { if (tty == 0) {
launcher->tty = tty; launcher->tty = dup(tty);
if (launcher->tty == -1) {
weston_log("couldn't dup stdin: %m\n");
return -1;
}
} else { } else {
snprintf(tty_device, sizeof tty_device, "/dev/tty%d", tty); snprintf(tty_device, sizeof tty_device, "/dev/tty%d", tty);
launcher->tty = open(tty_device, O_RDWR | O_CLOEXEC); launcher->tty = open(tty_device, O_RDWR | O_CLOEXEC);
@ -379,5 +383,6 @@ weston_launcher_destroy(struct weston_launcher *launcher)
wl_event_source_remove(launcher->vt_source); wl_event_source_remove(launcher->vt_source);
} }
close(launcher->tty);
free(launcher); free(launcher);
} }