From b110679002012873c9d44e865e65a5c7f8cc8b1b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 7 Aug 2014 07:17:03 -0700 Subject: [PATCH] * xterm.c (x_delete_terminal): Plug file descriptor leak. Fixes: debbugs:17691 --- src/ChangeLog | 4 ++++ src/xterm.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9369ee25cca..2c5001e9a5a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-08-07 Paul Eggert + + * xterm.c (x_delete_terminal): Plug file descriptor leak (Bug#17691). + 2014-08-07 Reuben Thomas Refer to MS-DOS using the same name everywhere. diff --git a/src/xterm.c b/src/xterm.c index 4ec38cfc5c6..7b8d32a4516 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11329,7 +11329,10 @@ x_delete_terminal (struct terminal *terminal) /* No more input on this descriptor. */ if (0 <= dpyinfo->connection) - delete_keyboard_wait_descriptor (dpyinfo->connection); + { + delete_keyboard_wait_descriptor (dpyinfo->connection); + emacs_close (dpyinfo->connection); + } /* Mark as dead. */ dpyinfo->display = NULL; -- 2.39.5