From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 7 Aug 2014 14:17:03 +0000 (-0700)
Subject: * xterm.c (x_delete_terminal): Plug file descriptor leak.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~507
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b110679002012873c9d44e865e65a5c7f8cc8b1b;p=emacs.git

* xterm.c (x_delete_terminal): Plug file descriptor leak.

Fixes: debbugs:17691
---

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  <eggert@cs.ucla.edu>
+
+	* xterm.c (x_delete_terminal): Plug file descriptor leak (Bug#17691).
+
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
 	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;